summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-25 14:14:21 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-25 14:14:21 +0100
commite9125dd5563484a067ef75b6fce4fbef235c5c6e (patch)
tree76003b3c06225cca688438f1aedc7d2a539174c8 /configure
parentd07b0d992736e01006caa64b87d996f902d357db (diff)
parent2c10e2a2f62477efaef5b641974594f7df4ca339 (diff)
downloadffmpeg-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-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index d3ab5a4..0f62610 100755
--- a/configure
+++ b/configure
@@ -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"
OpenPOWER on IntegriCloud