ensure all compiled in codec/muxer are registered

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@10808 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 7294e7f082aed059d61681948c63be0453266e1f..818ed1f2873c6591445ef2c9423b054ca1d9843d 100644 (file)
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -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);

diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index ad2d30aad2db4896bbbaeca55beda23552b8fb1b..1c4e0a55298c6ea34b8216d91f22793b78c6242e 100644 (file)
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -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);