[FFmpeg-cvslog] Merge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed May 11 19:43:59 2016 +0100| [ed8bacfb5ca888255e8e15e44fb25722d31cf565] | committer: Derek Buitenhuis

Merge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'

* commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a':
  lavc: move the vaapi encoders further down in the list of codecs

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed8bacfb5ca888255e8e15e44fb25722d31cf565
---

 libavcodec/allcodecs.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index b98e0fb..d435136 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -196,11 +196,9 @@ void avcodec_register_all(void)
 #if FF_API_VDPAU
     REGISTER_DECODER(H264_VDPAU,        h264_vdpau);
 #endif
-    REGISTER_ENCODER(H264_VAAPI,        h264_vaapi);
     REGISTER_ENCDEC (HAP,               hap);
     REGISTER_DECODER(HEVC,              hevc);
     REGISTER_DECODER(HEVC_QSV,          hevc_qsv);
-    REGISTER_ENCODER(HEVC_VAAPI,        hevc_vaapi);
     REGISTER_DECODER(HNM4_VIDEO,        hnm4_video);
     REGISTER_DECODER(HQ_HQA,            hq_hqa);
     REGISTER_DECODER(HQX,               hqx);
@@ -225,7 +223,6 @@ void avcodec_register_all(void)
     REGISTER_DECODER(MIMIC,             mimic);
     REGISTER_ENCDEC (MJPEG,             mjpeg);
     REGISTER_DECODER(MJPEGB,            mjpegb);
-    REGISTER_ENCODER(MJPEG_VAAPI,       mjpeg_vaapi);
     REGISTER_DECODER(MMVIDEO,           mmvideo);
     REGISTER_DECODER(MOTIONPIXELS,      motionpixels);
 #if FF_API_XVMC
@@ -618,13 +615,16 @@ void avcodec_register_all(void)
      * above is available */
     REGISTER_ENCODER(LIBOPENH264,       libopenh264);
     REGISTER_ENCODER(H264_QSV,          h264_qsv);
+    REGISTER_ENCODER(H264_VAAPI,        h264_vaapi);
     REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox);
     REGISTER_ENCODER(NVENC,             nvenc);
     REGISTER_ENCODER(H264_OMX,          h264_omx);
     REGISTER_ENCODER(NVENC_H264,        nvenc_h264);
     REGISTER_ENCODER(NVENC_HEVC,        nvenc_hevc);
     REGISTER_ENCODER(HEVC_QSV,          hevc_qsv);
+    REGISTER_ENCODER(HEVC_VAAPI,        hevc_vaapi);
     REGISTER_ENCODER(LIBKVAZAAR,        libkvazaar);
+    REGISTER_ENCODER(MJPEG_VAAPI,       mjpeg_vaapi);
     REGISTER_ENCODER(MPEG2_QSV,         mpeg2_qsv);
 
     /* parsers */


======================================================================

diff --cc libavcodec/allcodecs.c
index b98e0fb,9f9f0b3..d435136
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@@ -186,17 -162,10 +186,16 @@@ void avcodec_register_all(void
      REGISTER_ENCDEC (H261,              h261);
      REGISTER_ENCDEC (H263,              h263);
      REGISTER_DECODER(H263I,             h263i);
 -    REGISTER_ENCODER(H263P,             h263p);
 +    REGISTER_ENCDEC (H263P,             h263p);
      REGISTER_DECODER(H264,              h264);
 +    REGISTER_DECODER(H264_CRYSTALHD,    h264_crystalhd);
 +    REGISTER_DECODER(H264_MEDIACODEC,   h264_mediacodec);
      REGISTER_DECODER(H264_MMAL,         h264_mmal);
      REGISTER_DECODER(H264_QSV,          h264_qsv);
 +    REGISTER_DECODER(H264_VDA,          h264_vda);
 +#if FF_API_VDPAU
 +    REGISTER_DECODER(H264_VDPAU,        h264_vdpau);
 +#endif
-     REGISTER_ENCODER(H264_VAAPI,        h264_vaapi);
      REGISTER_ENCDEC (HAP,               hap);
      REGISTER_DECODER(HEVC,              hevc);
      REGISTER_DECODER(HEVC_QSV,          hevc_qsv);
@@@ -617,15 -483,21 +614,18 @@@
      /* external libraries, that shouldn't be used by default if one of the
       * above is available */
      REGISTER_ENCODER(LIBOPENH264,       libopenh264);
 -    REGISTER_ENCODER(H264_NVENC,        h264_nvenc);
 -    REGISTER_ENCODER(H264_OMX,          h264_omx);
      REGISTER_ENCODER(H264_QSV,          h264_qsv);
+     REGISTER_ENCODER(H264_VAAPI,        h264_vaapi);
 -    REGISTER_ENCODER(LIBKVAZAAR,        libkvazaar);
 -    REGISTER_ENCODER(HEVC_NVENC,        hevc_nvenc);
 +    REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox);
 +    REGISTER_ENCODER(NVENC,             nvenc);
 +    REGISTER_ENCODER(H264_OMX,          h264_omx);
 +    REGISTER_ENCODER(NVENC_H264,        nvenc_h264);
 +    REGISTER_ENCODER(NVENC_HEVC,        nvenc_hevc);
      REGISTER_ENCODER(HEVC_QSV,          hevc_qsv);
+     REGISTER_ENCODER(HEVC_VAAPI,        hevc_vaapi);
 +    REGISTER_ENCODER(LIBKVAZAAR,        libkvazaar);
+     REGISTER_ENCODER(MJPEG_VAAPI,       mjpeg_vaapi);
      REGISTER_ENCODER(MPEG2_QSV,         mpeg2_qsv);
 -    REGISTER_ENCODER(MPEG4_OMX,         mpeg4_omx);
 -#if FF_API_NVENC_OLD_NAME
 -    REGISTER_ENCODER(NVENC_H264,        nvenc_h264);
 -    REGISTER_ENCODER(NVENC_HEVC,        nvenc_hevc);
 -#endif
  
      /* parsers */
      REGISTER_PARSER(AAC,                aac);