diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2014-03-19 16:41:08 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2014-03-23 22:41:11 +0100 |
| commit | fb7127b2c836b53ad5168887cd12871312c8708d (patch) | |
| tree | c5ac77705c4e37d28b186ee23cfda2f692fc6695 | |
| parent | 2a38651033a4b2a45d8f73b635742951163b4fa8 (diff) | |
| download | ffmpeg-fb7127b2c836b53ad5168887cd12871312c8708d.tar.gz | |
build: h264 parser depends on full h264 decoder
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 6 |
2 files changed, 2 insertions, 6 deletions
@@ -1908,7 +1908,7 @@ wmv3_vaapi_hwaccel_select="vc1_vaapi_hwaccel" wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" # parsers -h264_parser_select="golomb h264chroma h264dsp h264pred h264qpel videodsp" +h264_parser_select="h264_decoder" mpeg4video_parser_select="error_resilience h263dsp mpegvideo" mpegvideo_parser_select="error_resilience mpegvideo" vc1_parser_select="mpegvideo" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3d178a1387..6817862b9b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -625,11 +625,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 |