[SCM] libav/experimental: build: h264 parser depends on full h264 decoder

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit fb7127b2c836b53ad5168887cd12871312c8708d
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Wed Mar 19 16:41:08 2014 +0100

    build: h264 parser depends on full h264 decoder

diff --git a/configure b/configure
index b80d389..766f636 100755
--- a/configure
+++ b/configure
@@ -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 3d178a1..6817862 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

-- 
Libav/FFmpeg packaging