[FFmpeg-cvslog] r19139 - in trunk: configure libavcodec/Makefile

[diego]

Author: diego
Date: Tue Jun  9 22:29:52 2009
New Revision: 19139

Log:
Express the H.264 parser dependency on the golomb code in configure instead of
in the Makefile as it is done for all other parts that depend on golomb.

Modified:
   trunk/configure
   trunk/libavcodec/Makefile

Modified: trunk/configure
==============================================================================
--- trunk/configure	Tue Jun  9 22:07:01 2009	(r19138)
+++ trunk/configure	Tue Jun  9 22:29:52 2009	(r19139)
@@ -1088,6 +1088,9 @@ zlib_encoder_select="zlib"
 zmbv_decoder_select="zlib"
 zmbv_encoder_select="zlib"
 
+# parsers
+h264_parser_select="golomb"
+
 # external libraries
 libamr_nb_decoder_deps="libamr_nb"
 libamr_nb_encoder_deps="libamr_nb"

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	Tue Jun  9 22:07:01 2009	(r19138)
+++ trunk/libavcodec/Makefile	Tue Jun  9 22:29:52 2009	(r19139)
@@ -407,7 +407,7 @@ OBJS-$(CONFIG_DVBSUB_PARSER)           +
 OBJS-$(CONFIG_DVDSUB_PARSER)           += dvdsub_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 h264idct.o h264pred.o cabac.o golomb.o mpegvideo.o error_resilience.o
+OBJS-$(CONFIG_H264_PARSER)             += h264_parser.o h264.o h264idct.o h264pred.o cabac.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_MJPEG_PARSER)            += mjpeg_parser.o
 OBJS-$(CONFIG_MLP_PARSER)              += mlp_parser.o mlp.o
 OBJS-$(CONFIG_MPEG4VIDEO_PARSER)       += mpeg4video_parser.o h263.o mpeg12data.o mpegvideo.o error_resilience.o