diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 14:14:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 14:14:21 +0100 |
| commit | e9125dd5563484a067ef75b6fce4fbef235c5c6e (patch) | |
| tree | 76003b3c06225cca688438f1aedc7d2a539174c8 /configure | |
| parent | d07b0d992736e01006caa64b87d996f902d357db (diff) | |
| parent | 2c10e2a2f62477efaef5b641974594f7df4ca339 (diff) | |
| download | ffmpeg-streaming-e9125dd5563484a067ef75b6fce4fbef235c5c6e.zip ffmpeg-streaming-e9125dd5563484a067ef75b6fce4fbef235c5c6e.tar.gz | |
Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339'
* commit '2c10e2a2f62477efaef5b641974594f7df4ca339':
build: Make the H.264 parser select h264qpel
x86: h264qpel: add cpu flag checks for init function
Conflicts:
libavcodec/x86/h264_qpel.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1824,7 +1824,7 @@ wmv3_vdpau_decoder_select="vc1_vdpau_decoder" wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" # parsers -h264_parser_select="error_resilience golomb h264dsp h264pred mpegvideo" +h264_parser_select="error_resilience golomb h264dsp h264pred h264qpel mpegvideo" mpeg4video_parser_select="error_resilience mpegvideo" mpegvideo_parser_select="error_resilience mpegvideo" vc1_parser_select="error_resilience mpegvideo" |
