diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-17 14:16:58 +0000 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-03-23 20:53:29 +0000 |
| commit | b21af32aed7e343f962753943e9f16baedfb1750 (patch) | |
| tree | c7cb6d77dd5d67a533d2f997b2a74a060bb036af | |
| parent | 312a9ef04bf6b55e68e4a61694b169cd3cc69bb8 (diff) | |
| download | ffmpeg-b21af32aed7e343f962753943e9f16baedfb1750.tar.gz | |
lavc: Prefer x264 over openh264 if both libraries are available
| -rw-r--r-- | libavcodec/allcodecs.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 4cba5fb9a9..9827719de7 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); |