Browse code

lavc: Move V4L2 encoders lower in the list

Their previous positioning would cause them to chosen before software
encoders like libx264 or libvpx.

Mark Thompson authored on 2017/09/28 07:34:06
Showing 1 changed files
... ...
@@ -208,10 +208,10 @@ static void register_all(void)
208 208
     REGISTER_ENCDEC (H263,              h263);
209 209
     REGISTER_DECODER(H263I,             h263i);
210 210
     REGISTER_ENCDEC (H263P,             h263p);
211
-    REGISTER_ENCDEC (H263_V4L2M2M,      h263_v4l2m2m);
211
+    REGISTER_DECODER(H263_V4L2M2M,      h263_v4l2m2m);
212 212
     REGISTER_DECODER(H264,              h264);
213 213
     REGISTER_DECODER(H264_CRYSTALHD,    h264_crystalhd);
214
-    REGISTER_ENCDEC (H264_V4L2M2M,      h264_v4l2m2m);
214
+    REGISTER_DECODER(H264_V4L2M2M,      h264_v4l2m2m);
215 215
     REGISTER_DECODER(H264_MEDIACODEC,   h264_mediacodec);
216 216
     REGISTER_DECODER(H264_MMAL,         h264_mmal);
217 217
     REGISTER_DECODER(H264_QSV,          h264_qsv);
... ...
@@ -224,7 +224,7 @@ static void register_all(void)
224 224
     REGISTER_DECODER(HEVC,              hevc);
225 225
     REGISTER_DECODER(HEVC_QSV,          hevc_qsv);
226 226
     REGISTER_DECODER(HEVC_RKMPP,        hevc_rkmpp);
227
-    REGISTER_ENCDEC (HEVC_V4L2M2M,      hevc_v4l2m2m);
227
+    REGISTER_DECODER(HEVC_V4L2M2M,      hevc_v4l2m2m);
228 228
     REGISTER_DECODER(HNM4_VIDEO,        hnm4_video);
229 229
     REGISTER_DECODER(HQ_HQA,            hq_hqa);
230 230
     REGISTER_DECODER(HQX,               hqx);
... ...
@@ -259,7 +259,7 @@ static void register_all(void)
259 259
     REGISTER_ENCDEC (MPEG2VIDEO,        mpeg2video);
260 260
     REGISTER_ENCDEC (MPEG4,             mpeg4);
261 261
     REGISTER_DECODER(MPEG4_CRYSTALHD,   mpeg4_crystalhd);
262
-    REGISTER_ENCDEC (MPEG4_V4L2M2M,     mpeg4_v4l2m2m);
262
+    REGISTER_DECODER(MPEG4_V4L2M2M,     mpeg4_v4l2m2m);
263 263
     REGISTER_DECODER(MPEG4_MMAL,        mpeg4_mmal);
264 264
 #if FF_API_VDPAU
265 265
     REGISTER_DECODER(MPEG4_VDPAU,       mpeg4_vdpau);
... ...
@@ -383,7 +383,7 @@ static void register_all(void)
383 383
     REGISTER_DECODER(VP7,               vp7);
384 384
     REGISTER_DECODER(VP8,               vp8);
385 385
     REGISTER_DECODER(VP8_RKMPP,         vp8_rkmpp);
386
-    REGISTER_ENCDEC (VP8_V4L2M2M,       vp8_v4l2m2m);
386
+    REGISTER_DECODER(VP8_V4L2M2M,       vp8_v4l2m2m);
387 387
     REGISTER_DECODER(VP9,               vp9);
388 388
     REGISTER_DECODER(VP9_RKMPP,         vp9_rkmpp);
389 389
     REGISTER_DECODER(VP9_V4L2M2M,       vp9_v4l2m2m);
... ...
@@ -668,11 +668,13 @@ static void register_all(void)
668 668
 
669 669
     /* external libraries, that shouldn't be used by default if one of the
670 670
      * above is available */
671
+    REGISTER_ENCODER(H263_V4L2M2M,      h263_v4l2m2m);
671 672
     REGISTER_ENCDEC (LIBOPENH264,       libopenh264);
672 673
     REGISTER_DECODER(H264_CUVID,        h264_cuvid);
673 674
     REGISTER_ENCODER(H264_NVENC,        h264_nvenc);
674 675
     REGISTER_ENCODER(H264_OMX,          h264_omx);
675 676
     REGISTER_ENCODER(H264_QSV,          h264_qsv);
677
+    REGISTER_ENCODER(H264_V4L2M2M,      h264_v4l2m2m);
676 678
     REGISTER_ENCODER(H264_VAAPI,        h264_vaapi);
677 679
     REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox);
678 680
 #if FF_API_NVENC_OLD_NAME
... ...
@@ -684,6 +686,7 @@ static void register_all(void)
684 684
     REGISTER_DECODER(HEVC_MEDIACODEC,   hevc_mediacodec);
685 685
     REGISTER_ENCODER(HEVC_NVENC,        hevc_nvenc);
686 686
     REGISTER_ENCODER(HEVC_QSV,          hevc_qsv);
687
+    REGISTER_ENCODER(HEVC_V4L2M2M,      hevc_v4l2m2m);
687 688
     REGISTER_ENCODER(HEVC_VAAPI,        hevc_vaapi);
688 689
     REGISTER_ENCODER(LIBKVAZAAR,        libkvazaar);
689 690
     REGISTER_DECODER(MJPEG_CUVID,       mjpeg_cuvid);
... ...
@@ -694,10 +697,12 @@ static void register_all(void)
694 694
     REGISTER_ENCODER(MPEG2_VAAPI,       mpeg2_vaapi);
695 695
     REGISTER_DECODER(MPEG4_CUVID,       mpeg4_cuvid);
696 696
     REGISTER_DECODER(MPEG4_MEDIACODEC,  mpeg4_mediacodec);
697
+    REGISTER_ENCODER(MPEG4_V4L2M2M,     mpeg4_v4l2m2m);
697 698
     REGISTER_DECODER(VC1_CUVID,         vc1_cuvid);
698 699
     REGISTER_DECODER(VP8_CUVID,         vp8_cuvid);
699 700
     REGISTER_DECODER(VP8_MEDIACODEC,    vp8_mediacodec);
700 701
     REGISTER_DECODER(VP8_QSV,           vp8_qsv);
702
+    REGISTER_ENCODER(VP8_V4L2M2M,       vp8_v4l2m2m);
701 703
     REGISTER_ENCODER(VP8_VAAPI,         vp8_vaapi);
702 704
     REGISTER_DECODER(VP9_CUVID,         vp9_cuvid);
703 705
     REGISTER_DECODER(VP9_MEDIACODEC,    vp9_mediacodec);