* commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a': lavc: move the vaapi encoders further down in the list of codecs
Unified · Split
| @@ -196,11 +196,9 @@ void avcodec_register_all(void) · 195 unmodified lines | |||
| 196 | #if FF_API_VDPAU | 196 | #if FF_API_VDPAU |
| 197 | REGISTER_DECODER(H264_VDPAU, h264_vdpau); | 197 | REGISTER_DECODER(H264_VDPAU, h264_vdpau); |
| 198 | #endif | 198 | #endif |
| 199 | REGISTER_ENCODER(H264_VAAPI, h264_vaapi); | ||
| 200 | REGISTER_ENCDEC (HAP, hap); | 199 | REGISTER_ENCDEC (HAP, hap); |
| 201 | REGISTER_DECODER(HEVC, hevc); | 200 | REGISTER_DECODER(HEVC, hevc); |
| 202 | REGISTER_DECODER(HEVC_QSV, hevc_qsv); | 201 | REGISTER_DECODER(HEVC_QSV, hevc_qsv); |
| 203 | REGISTER_ENCODER(HEVC_VAAPI, hevc_vaapi); | ||
| 204 | REGISTER_DECODER(HNM4_VIDEO, hnm4_video); | 202 | REGISTER_DECODER(HNM4_VIDEO, hnm4_video); |
| 205 | REGISTER_DECODER(HQ_HQA, hq_hqa); | 203 | REGISTER_DECODER(HQ_HQA, hq_hqa); |
| 206 | REGISTER_DECODER(HQX, hqx); | 204 | REGISTER_DECODER(HQX, hqx); |
| @@ -225,7 +223,6 @@ void avcodec_register_all(void) · 18 unmodified lines | |||
| 225 | REGISTER_DECODER(MIMIC, mimic); | 223 | REGISTER_DECODER(MIMIC, mimic); |
| 226 | REGISTER_ENCDEC (MJPEG, mjpeg); | 224 | REGISTER_ENCDEC (MJPEG, mjpeg); |
| 227 | REGISTER_DECODER(MJPEGB, mjpegb); | 225 | REGISTER_DECODER(MJPEGB, mjpegb); |
| 228 | REGISTER_ENCODER(MJPEG_VAAPI, mjpeg_vaapi); | ||
| 229 | REGISTER_DECODER(MMVIDEO, mmvideo); | 226 | REGISTER_DECODER(MMVIDEO, mmvideo); |
| 230 | REGISTER_DECODER(MOTIONPIXELS, motionpixels); | 227 | REGISTER_DECODER(MOTIONPIXELS, motionpixels); |
| 231 | #if FF_API_XVMC | 228 | #if FF_API_XVMC |
| @@ -618,13 +615,16 @@ void avcodec_register_all(void) · 386 unmodified lines | |||
| 618 | * above is available */ | 615 | * above is available */ |
| 619 | REGISTER_ENCODER(LIBOPENH264, libopenh264); | 616 | REGISTER_ENCODER(LIBOPENH264, libopenh264); |
| 620 | REGISTER_ENCODER(H264_QSV, h264_qsv); | 617 | REGISTER_ENCODER(H264_QSV, h264_qsv); |
| 618 | REGISTER_ENCODER(H264_VAAPI, h264_vaapi); | ||
| 621 | REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox); | 619 | REGISTER_ENCODER(H264_VIDEOTOOLBOX, h264_videotoolbox); |
| 622 | REGISTER_ENCODER(NVENC, nvenc); | 620 | REGISTER_ENCODER(NVENC, nvenc); |
| 623 | REGISTER_ENCODER(H264_OMX, h264_omx); | 621 | REGISTER_ENCODER(H264_OMX, h264_omx); |
| 624 | REGISTER_ENCODER(NVENC_H264, nvenc_h264); | 622 | REGISTER_ENCODER(NVENC_H264, nvenc_h264); |
| 625 | REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc); | 623 | REGISTER_ENCODER(NVENC_HEVC, nvenc_hevc); |
| 626 | REGISTER_ENCODER(HEVC_QSV, hevc_qsv); | 624 | REGISTER_ENCODER(HEVC_QSV, hevc_qsv); |
| 625 | REGISTER_ENCODER(HEVC_VAAPI, hevc_vaapi); | ||
| 627 | REGISTER_ENCODER(LIBKVAZAAR, libkvazaar); | 626 | REGISTER_ENCODER(LIBKVAZAAR, libkvazaar); |
| 627 | REGISTER_ENCODER(MJPEG_VAAPI, mjpeg_vaapi); | ||
| 628 | REGISTER_ENCODER(MPEG2_QSV, mpeg2_qsv); | 628 | REGISTER_ENCODER(MPEG2_QSV, mpeg2_qsv); |
| 629 | 629 | ||
| 630 | /* parsers */ | 630 | /* parsers */ |