From f9a00ba8c1a12a70d3cf578479853b8eb899079e Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Thu, 18 Oct 2007 23:59:31 +0000 Subject: [PATCH] ensure all compiled in codec/muxer are registered Originally committed as revision 10808 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/allcodecs.c | 3 +-- libavformat/allformats.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 7294e7f082..818ed1f287 100644 --- 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 ad2d30aad2..1c4e0a5529 100644 --- 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); -- 2.11.0