[vlc-commits] FLAC: split encoder from decoder

Jean-Baptiste Kempf git at videolan.org
Wed Sep 26 19:57:31 CEST 2012


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Sep 26 19:52:38 2012 +0200| [a43e19d4ace61b776a634de544f3208b6f8ffec9] | committer: Jean-Baptiste Kempf

FLAC: split encoder from decoder

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a43e19d4ace61b776a634de544f3208b6f8ffec9
---

 modules/codec/flac.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/codec/flac.c b/modules/codec/flac.c
index 8e0db10..dda9fd3 100644
--- a/modules/codec/flac.c
+++ b/modules/codec/flac.c
@@ -93,8 +93,10 @@ static const int pi_channels_maps[9] =
 static int  OpenDecoder   ( vlc_object_t * );
 static void CloseDecoder  ( vlc_object_t * );
 
+#ifdef ENABLE_SOUT
 static int OpenEncoder   ( vlc_object_t * );
 static void CloseEncoder ( vlc_object_t * );
+#endif
 
 static block_t *DecodeBlock( decoder_t *, block_t ** );
 
@@ -111,11 +113,13 @@ vlc_module_begin ()
     set_capability( "decoder", 100 )
     set_callbacks( OpenDecoder, CloseDecoder )
 
+#ifdef ENABLE_SOUT
     add_submodule ()
     add_shortcut( "flac" )
     set_description( N_("Flac audio encoder") )
     set_capability( "encoder", 100 )
     set_callbacks( OpenEncoder, CloseEncoder )
+#endif
 
 vlc_module_end ()
 
@@ -568,6 +572,8 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     return p_sys->p_aout_buffer;
 }
 
+#ifdef ENABLE_SOUT
+
 /*****************************************************************************
  * encoder_sys_t : flac encoder descriptor
  *****************************************************************************/
@@ -790,3 +796,4 @@ static void CloseEncoder( vlc_object_t *p_this )
     free( p_sys->p_buffer );
     free( p_sys );
 }
+#endif



More information about the vlc-commits mailing list