diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 00:20:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 00:20:56 +0100 |
| commit | 0dd4eff588c59d0c1412eb4a907004017e76badd (patch) | |
| tree | d810d42e14ce84545e6ba942464961cb4b507493 | |
| parent | 3788b8dbe698384d0167c9f79242d9076168f178 (diff) | |
| parent | fb7127b2c836b53ad5168887cd12871312c8708d (diff) | |
| download | ffmpeg-0dd4eff588c59d0c1412eb4a907004017e76badd.tar.gz | |
Merge commit 'fb7127b2c836b53ad5168887cd12871312c8708d'
* commit 'fb7127b2c836b53ad5168887cd12871312c8708d':
build: h264 parser depends on full h264 decoder
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 6 |
2 files changed, 2 insertions, 6 deletions
@@ -2205,7 +2205,7 @@ wmv3_vdpau_decoder_select="vc1_vdpau_decoder" wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" # parsers -h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp" +h264_parser_select="h264_decoder" hevc_parser_select="hevc_decoder" mpeg4video_parser_select="error_resilience h263dsp mpegvideo" mpegvideo_parser_select="error_resilience mpegvideo" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b7c33eb0fb..43c3f87260 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -755,11 +755,7 @@ OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o \ OBJS-$(CONFIG_GSM_PARSER) += gsm_parser.o OBJS-$(CONFIG_H261_PARSER) += h261_parser.o OBJS-$(CONFIG_H263_PARSER) += h263_parser.o -OBJS-$(CONFIG_H264_PARSER) += h264_parser.o h264.o \ - cabac.o \ - h264_refs.o h264_sei.o h264_direct.o \ - h264_loopfilter.o h264_cabac.o \ - h264_cavlc.o h264_ps.o +OBJS-$(CONFIG_H264_PARSER) += h264_parser.o OBJS-$(CONFIG_HEVC_PARSER) += hevc_parser.o OBJS-$(CONFIG_MJPEG_PARSER) += mjpeg_parser.o OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.o |