ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Mar 17 14:16:58 2015 +0000| [b21af32aed7e343f962753943e9f16baedfb1750] | committer: Vittorio Giovara
lavc: Prefer x264 over openh264 if both libraries are available > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b21af32aed7e343f962753943e9f16baedfb1750 --- libavcodec/allcodecs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 4cba5fb..9827719 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -448,7 +448,6 @@ void avcodec_register_all(void) REGISTER_ENCODER(LIBMP3LAME, libmp3lame); REGISTER_ENCDEC (LIBOPENCORE_AMRNB, libopencore_amrnb); REGISTER_DECODER(LIBOPENCORE_AMRWB, libopencore_amrwb); - REGISTER_ENCODER(LIBOPENH264, libopenh264); REGISTER_ENCDEC (LIBOPENJPEG, libopenjpeg); REGISTER_ENCDEC (LIBOPUS, libopus); REGISTER_ENCDEC (LIBSCHROEDINGER, libschroedinger); @@ -467,6 +466,10 @@ void avcodec_register_all(void) REGISTER_ENCODER(LIBXAVS, libxavs); REGISTER_ENCODER(LIBXVID, libxvid); + /* external libraries, that shouldn't be used by default if one of the + * above is available */ + REGISTER_ENCODER(LIBOPENH264, libopenh264); + /* parsers */ REGISTER_PARSER(AAC, aac); REGISTER_PARSER(AAC_LATM, aac_latm); _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
