diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 11:17:12 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-07-09 11:17:12 +0200 |
commit | 96ee6b9962ec0479deddedd64a46aef4846d90ba (patch) | |
tree | 5e04e55a9a85d82b124c76fd4cb36ef948306dea /configure | |
parent | 07ae8fa20ef202206157efebf0a09db9a9cb9634 (diff) | |
parent | 3a85397e8bb477eb34678d9edc52893f57003226 (diff) |
Merge commit '3a85397e8bb477eb34678d9edc52893f57003226'
* commit '3a85397e8bb477eb34678d9edc52893f57003226':
lavc: add Intel libmfx-based MPEG2 encoder
Conflicts:
Changelog
configure
libavcodec/allcodecs.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2253,6 +2253,7 @@ mpeg1video_decoder_select="error_resilience mpeg_er mpegvideo" mpeg1video_encoder_select="aandcttables mpegvideoenc h263dsp" mpeg2video_decoder_select="error_resilience mpeg_er mpegvideo" mpeg2video_encoder_select="aandcttables mpegvideoenc h263dsp" +mpeg2_qsv_encoder_select="qsvenc" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" msmpeg4v1_decoder_select="h263_decoder" |