Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'

[ffmpeg] / configure

diff --git a/configure b/configure
index e8d2c9a4619f90cc99d071303eba57792667ca00..a10fea4e3f17cc2e56954c50fb69170a19c91fe1 100755 (executable)
--- a/configure
+++ b/configure
@@ -1752,6 +1752,7 @@ CONFIG_EXTRA="
     aandcttables
     ac3dsp
     audio_frame_queue
+    cabac
     dsputil
     exif
     frame_thread_encoder
@@ -2013,9 +2014,9 @@ h263_decoder_select="error_resilience h263_parser h263dsp mpegvideo"
 h263_encoder_select="aandcttables h263dsp mpegvideoenc"
 h263i_decoder_select="h263_decoder"
 h263p_encoder_select="h263_encoder"
-h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp"
+h264_decoder_select="cabac golomb h264chroma h264dsp h264pred h264qpel videodsp"
 h264_decoder_suggest="error_resilience"
-hevc_decoder_select="dsputil golomb videodsp"
+hevc_decoder_select="cabac dsputil golomb videodsp"
 huffyuv_decoder_select="dsputil llviddsp"
 huffyuv_encoder_select="dsputil huffman llviddsp"
 iac_decoder_select="imc_decoder"
@@ -3636,10 +3637,12 @@ elif enabled ppc; then
         e500v2)
             cpuflags="-mcpu=8548 -mhard-float -mfloat-gprs=double"
             disable altivec
+            disable dcbzl
         ;;
         e500)
             cpuflags="-mcpu=8540 -mhard-float"
             disable altivec
+            disable dcbzl
         ;;
     esac
 
@@ -4260,8 +4263,7 @@ elif enabled ppc; then
 
     enable local_aligned_8 local_aligned_16
 
-    [ $cpu != e500 -a $cpu != e500v2 ] &&
-     check_inline_asm dcbzl    '"dcbzl 0, %0" :: "r"(0)'
+    check_inline_asm dcbzl     '"dcbzl 0, %0" :: "r"(0)'
     check_inline_asm ibm_asm   '"add 0, 0, 0"'
     check_inline_asm ppc4xx    '"maclhw r10, r11, r12"'
     check_inline_asm xform_asm '"lwzx %1, %y0" :: "Z"(*(int*)0), "r"(0)'