Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 19:55:23 +0000 (20:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Mar 2014 19:55:23 +0000 (20:55 +0100)
* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834':
  build: Add config option for CABAC code

Conflicts:
configure
libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavcodec/Makefile

diff --cc configure
+++ b/configure
@@@ -1752,9 -1512,8 +1752,10 @@@ CONFIG_EXTRA=
      aandcttables
      ac3dsp
      audio_frame_queue
+     cabac
      dsputil
 +    exif
 +    frame_thread_encoder
      gcrypt
      golomb
      gplv3
@@@ -2013,11 -1749,11 +2014,11 @@@ h263_decoder_select="error_resilience h
  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"
 -huffyuv_encoder_select="dsputil huffman"
 +huffyuv_decoder_select="dsputil llviddsp"
 +huffyuv_encoder_select="dsputil huffman llviddsp"
  iac_decoder_select="imc_decoder"
  imc_decoder_select="dsputil fft mdct sinewin"
  indeo3_decoder_select="hpeldsp"
@@@ -34,7 -29,7 +34,8 @@@ OBJS = allcodecs.
  OBJS-$(CONFIG_AANDCTTABLES)            += aandcttab.o
  OBJS-$(CONFIG_AC3DSP)                  += ac3dsp.o
  OBJS-$(CONFIG_AUDIO_FRAME_QUEUE)       += audio_frame_queue.o
+ OBJS-$(CONFIG_CABAC)                   += cabac.o
 +OBJS-$(CONFIG_CRYSTALHD)               += crystalhd.o
  OBJS-$(CONFIG_DCT)                     += dct.o dct32_fixed.o dct32_float.o
  OBJS-$(CONFIG_DXVA2)                   += dxva2.o
  OBJS-$(CONFIG_DSPUTIL)                 += dsputil.o faanidct.o          \
@@@ -234,12 -198,10 +235,11 @@@ OBJS-$(CONFIG_H263_ENCODER)            
  OBJS-$(CONFIG_H264_DECODER)            += h264.o h264_cabac.o h264_cavlc.o \
                                            h264_direct.o h264_loopfilter.o  \
                                            h264_mb.o h264_picture.o h264_ps.o \
-                                           h264_refs.o h264_sei.o h264_slice.o \
-                                           cabac.o
+                                           h264_refs.o h264_sei.o h264_slice.o
 +OBJS-$(CONFIG_H264_VDA_DECODER)        += vda_h264_dec.o
  OBJS-$(CONFIG_HEVC_DECODER)            += hevc.o hevc_mvs.o hevc_ps.o hevc_sei.o \
                                            hevc_cabac.o hevc_refs.o hevcpred.o    \
-                                           hevcdsp.o hevc_filter.o cabac.o
+                                           hevcdsp.o hevc_filter.o
  OBJS-$(CONFIG_HNM4_VIDEO_DECODER)      += hnm4video.o
  OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o huffyuvdec.o
  OBJS-$(CONFIG_HUFFYUV_ENCODER)         += huffyuv.o huffyuvenc.o