History

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.

Anton Khirnov committed 10 years ago

Commit 5e1a3ea1 parent 92fdea31 file · +3 −3Browse files

Showing the changes to libavcodec/allcodecs.c (1 of 1 file). Show all

Unified · Split

libavcodec/allcodecs.c+3−3
@@ -166,11 +166,9 @@ void avcodec_register_all(void) · 165 unmodified lines
166 REGISTER_DECODER(H264, h264);166 REGISTER_DECODER(H264, h264);
167 REGISTER_DECODER(H264_MMAL, h264_mmal);167 REGISTER_DECODER(H264_MMAL, h264_mmal);
168 REGISTER_DECODER(H264_QSV, h264_qsv);168 REGISTER_DECODER(H264_QSV, h264_qsv);
169 REGISTER_ENCODER(H264_VAAPI, h264_vaapi);
170 REGISTER_ENCDEC (HAP, hap);169 REGISTER_ENCDEC (HAP, hap);
171 REGISTER_DECODER(HEVC, hevc);170 REGISTER_DECODER(HEVC, hevc);
172 REGISTER_DECODER(HEVC_QSV, hevc_qsv);171 REGISTER_DECODER(HEVC_QSV, hevc_qsv);
173 REGISTER_ENCODER(HEVC_VAAPI, hevc_vaapi);
174 REGISTER_DECODER(HNM4_VIDEO, hnm4_video);172 REGISTER_DECODER(HNM4_VIDEO, hnm4_video);
175 REGISTER_DECODER(HQ_HQA, hq_hqa);173 REGISTER_DECODER(HQ_HQA, hq_hqa);
176 REGISTER_DECODER(HQX, hqx);174 REGISTER_DECODER(HQX, hqx);
@@ -195,7 +193,6 @@ void avcodec_register_all(void) · 18 unmodified lines
195 REGISTER_DECODER(MIMIC, mimic);193 REGISTER_DECODER(MIMIC, mimic);
196 REGISTER_ENCDEC (MJPEG, mjpeg);194 REGISTER_ENCDEC (MJPEG, mjpeg);
197 REGISTER_DECODER(MJPEGB, mjpegb);195 REGISTER_DECODER(MJPEGB, mjpegb);
198 REGISTER_ENCODER(MJPEG_VAAPI, mjpeg_vaapi);
199 REGISTER_DECODER(MMVIDEO, mmvideo);196 REGISTER_DECODER(MMVIDEO, mmvideo);
200 REGISTER_DECODER(MOTIONPIXELS, motionpixels);197 REGISTER_DECODER(MOTIONPIXELS, motionpixels);
201#if FF_API_XVMC198#if FF_API_XVMC
@@ -489,9 +486,12 @@ void avcodec_register_all(void) · 287 unmodified lines
489 REGISTER_ENCODER(H264_NVENC, h264_nvenc);486 REGISTER_ENCODER(H264_NVENC, h264_nvenc);
490 REGISTER_ENCODER(H264_OMX, h264_omx);487 REGISTER_ENCODER(H264_OMX, h264_omx);
491 REGISTER_ENCODER(H264_QSV, h264_qsv);488 REGISTER_ENCODER(H264_QSV, h264_qsv);
489 REGISTER_ENCODER(H264_VAAPI, h264_vaapi);
492 REGISTER_ENCODER(LIBKVAZAAR, libkvazaar);490 REGISTER_ENCODER(LIBKVAZAAR, libkvazaar);
493 REGISTER_ENCODER(HEVC_NVENC, hevc_nvenc);491 REGISTER_ENCODER(HEVC_NVENC, hevc_nvenc);
494 REGISTER_ENCODER(HEVC_QSV, hevc_qsv);492 REGISTER_ENCODER(HEVC_QSV, hevc_qsv);
493 REGISTER_ENCODER(HEVC_VAAPI, hevc_vaapi);
494 REGISTER_ENCODER(MJPEG_VAAPI, mjpeg_vaapi);
495 REGISTER_ENCODER(MPEG2_QSV, mpeg2_qsv);495 REGISTER_ENCODER(MPEG2_QSV, mpeg2_qsv);
496 REGISTER_ENCODER(MPEG4_OMX, mpeg4_omx);496 REGISTER_ENCODER(MPEG4_OMX, mpeg4_omx);
497#if FF_API_NVENC_OLD_NAME497#if FF_API_NVENC_OLD_NAME

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t