Merge commit 'b21af32aed7e343f962753943e9f16baedfb1750'

* commit 'b21af32aed7e343f962753943e9f16baedfb1750':
  lavc: Prefer x264 over openh264 if both libraries are available

See: ddae03f69bc1c6ec97c028c91837710944427b83
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/allcodecs.c
index bbf70a6ce3e44a68832aa3cfc07454ceb6306d33,9827719de7541cfb7f32ab96aa3854e842b30244..071446f4a8d8ad621bab579bd90162e9988eca0c
--- 1/libavcodec/allcodecs.c
--- 2/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@@ -542,15 -465,11 +542,18 @@@ void avcodec_register_all(void
      REGISTER_ENCODER(LIBX265,           libx265);
      REGISTER_ENCODER(LIBXAVS,           libxavs);
      REGISTER_ENCODER(LIBXVID,           libxvid);
-     REGISTER_ENCODER(LIBOPENH264,       libopenh264);
 +    REGISTER_DECODER(LIBZVBI_TELETEXT,  libzvbi_teletext);
 +    REGISTER_ENCODER(LIBAACPLUS,        libaacplus);
 +
 +    /* 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);