[FFmpeg-cvslog] r10808 - in trunk: libavcodec/allcodecs.c libavformat/allformats.c

[aurel]

Author: aurel
Date: Fri Oct 19 01:59:31 2007
New Revision: 10808

Log:
ensure all compiled in codec/muxer are registered

Modified:
   trunk/libavcodec/allcodecs.c
   trunk/libavformat/allformats.c

Modified: trunk/libavcodec/allcodecs.c
==============================================================================
--- trunk/libavcodec/allcodecs.c	(original)
+++ trunk/libavcodec/allcodecs.c	Fri Oct 19 01:59:31 2007
@@ -190,8 +190,7 @@ void avcodec_register_all(void)
     REGISTER_ENCDEC  (LIBGSM_MS, libgsm_ms);
     REGISTER_ENCODER (LIBMP3LAME, libmp3lame);
     REGISTER_ENCODER (LIBTHEORA, libtheora);
-    if (!ENABLE_VORBIS_ENCODER)  REGISTER_ENCODER (LIBVORBIS, libvorbis);
-    if (!ENABLE_VORBIS_DECODER)  REGISTER_DECODER (LIBVORBIS, libvorbis);
+    REGISTER_ENCDEC  (LIBVORBIS, libvorbis);
     REGISTER_DECODER (MACE3, mace3);
     REGISTER_DECODER (MACE6, mace6);
     REGISTER_ENCDEC  (MP2, mp2);

Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c	(original)
+++ trunk/libavformat/allformats.c	Fri Oct 19 01:59:31 2007
@@ -94,8 +94,7 @@ void av_register_all(void)
     REGISTER_DEMUXER  (INGENIENT, ingenient);
     REGISTER_DEMUXER  (IPMOVIE, ipmovie);
     REGISTER_DEMUXER  (LIBDC1394, libdc1394);
-    if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
-    if (!ENABLE_NUT_MUXER)   REGISTER_MUXER   (LIBNUT, libnut);
+    REGISTER_MUXDEMUX (LIBNUT, libnut);
     REGISTER_MUXDEMUX (M4V, m4v);
     REGISTER_MUXDEMUX (MATROSKA, matroska);
     REGISTER_MUXER    (MATROSKA_AUDIO, matroska_audio);