Commit ddae03f6 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/allcodecs: prefer x264 over openh264 if both are available

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent c09eeca5
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment