diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 02:06:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-24 02:23:29 +0100 |
| commit | 2850131f2c7abaede32b39ed6eaeecfbf77e6042 (patch) | |
| tree | ae4954eb725a72599a3027fe25a7e7c0e62f5b0c /libavcodec | |
| parent | 3e3995619807b01166df5f3edd1edf64af211b1c (diff) | |
| parent | b21af32aed7e343f962753943e9f16baedfb1750 (diff) | |
Merge commit 'b21af32aed7e343f962753943e9f16baedfb1750'
* commit 'b21af32aed7e343f962753943e9f16baedfb1750':
lavc: Prefer x264 over openh264 if both libraries are available
See: ddae03f69bc1c6ec97c028c91837710944427b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 bbf70a6ce3..071446f4a8 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -544,13 +544,16 @@ void avcodec_register_all(void) REGISTER_ENCODER(LIBXVID, libxvid); REGISTER_DECODER(LIBZVBI_TELETEXT, libzvbi_teletext); REGISTER_ENCODER(LIBAACPLUS, libaacplus); - REGISTER_ENCODER(LIBOPENH264, libopenh264); /* text */ REGISTER_DECODER(BINTEXT, bintext); REGISTER_DECODER(XBIN, xbin); REGISTER_DECODER(IDF, idf); + /* 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); |