diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 01:15:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-07 01:15:57 +0100 |
| commit | ddae03f69bc1c6ec97c028c91837710944427b83 (patch) | |
| tree | c740b1c8b217a4ed693de15109aceadf9e1eb847 | |
| parent | c09eeca5468ca03cc5733f08dc6303b4aef2c2c1 (diff) | |
| download | ffmpeg-ddae03f69bc1c6ec97c028c91837710944427b83.tar.gz | |
avcodec/allcodecs: prefer x264 over openh264 if both are available
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/allcodecs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 053bca4f3b..512711efc3 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -511,7 +511,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); @@ -535,6 +534,7 @@ 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); |