diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 20:55:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 20:55:23 +0100 |
| commit | ab8d9fe9b84c92b21354a7e5df3b61a28477f576 (patch) | |
| tree | 9bb438dc1e4d65df4f20bd0fce15ed3f3126c956 | |
| parent | bce2abc9362d3403a74ec60f6bac5bb3e2cdcdc4 (diff) | |
| parent | 8ef33497a6a3ed05d2f931809c074ef3d1878834 (diff) | |
| download | ffmpeg-ab8d9fe9b84c92b21354a7e5df3b61a28477f576.tar.gz | |
Merge commit '8ef33497a6a3ed05d2f931809c074ef3d1878834'
* commit '8ef33497a6a3ed05d2f931809c074ef3d1878834':
build: Add config option for CABAC code
Conflicts:
configure
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavcodec/Makefile | 6 |
2 files changed, 6 insertions, 5 deletions
@@ -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" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1182dcfcd4..0176ed6b93 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -34,6 +34,7 @@ OBJS = allcodecs.o \ 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 @@ -234,12 +235,11 @@ OBJS-$(CONFIG_H263_ENCODER) += mpeg4videoenc.o mpeg4video.o \ 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 |