diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-04-15 10:10:57 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-04-15 10:10:57 +0200 |
| commit | 5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a (patch) | |
| tree | ff72fd7d25d93576f94128031adca5a017ac6831 /libavcodec | |
| parent | 92fdea37477b5a2d1329e5ef0773e24473fa8f12 (diff) | |
lavc: move the vaapi encoders further down in the list of codecs
Right now they are the first encoders for those codecs in the list, so
they are selected when the caller requests a codec by id.
Since they require special treatment, they should not be selected by
default if there are other encoders (e.g. libx264/5) available.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/allcodecs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 16e9cd647c..9f9f0b3b31 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -166,11 +166,9 @@ void avcodec_register_all(void) REGISTER_DECODER(H264, h264); REGISTER_DECODER(H264_MMAL, h264_mmal); REGISTER_DECODER(H264_QSV, h264_qsv); - 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); @@ -195,7 +193,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 @@ -489,9 +486,12 @@ void avcodec_register_all(void) 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(HEVC_QSV, hevc_qsv); + REGISTER_ENCODER(HEVC_VAAPI, hevc_vaapi); + REGISTER_ENCODER(MJPEG_VAAPI, mjpeg_vaapi); REGISTER_ENCODER(MPEG2_QSV, mpeg2_qsv); REGISTER_ENCODER(MPEG4_OMX, mpeg4_omx); #if FF_API_NVENC_OLD_NAME |