Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'

* commit '2c62fcdf5d617791a653d7957d449f75569eede0': lavc: VAAPI H.264 encoder

Derek Buitenhuis committed 10 years ago

Commit b975aee2 parents 508957f 2c62fcd8 files · +967 −1Browse files

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

Unified · Split

@@ -196,6 +196,7 @@ 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);
199	REGISTER_ENCDEC (HAP, hap);	200	REGISTER_ENCDEC (HAP, hap);
200	REGISTER_DECODER(HEVC, hevc);	201	REGISTER_DECODER(HEVC, hevc);
201	REGISTER_DECODER(HEVC_QSV, hevc_qsv);	202	REGISTER_DECODER(HEVC_QSV, hevc_qsv);

Keyboard shortcuts