diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-11 19:43:59 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-11 19:45:20 +0100 |
| commit | ed8bacfb5ca888255e8e15e44fb25722d31cf565 (patch) | |
| tree | 858b5cb05a2ba6e093c88cb34d08d4e1c3a7d6e4 /libavcodec | |
| parent | 8ed427f9f92fd45c2510c019dba932acda74817f (diff) | |
| parent | 5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a (diff) | |
| download | ffmpeg-ed8bacfb5ca888255e8e15e44fb25722d31cf565.tar.gz | |
Merge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'
* commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a':
lavc: move the vaapi encoders further down in the list of codecs
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
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 b98e0fb829..d435136c84 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 */ |