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.

Originally committed as revision 19139 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Diego Biurrun 16 years ago
parent ef434a4b24
commit 28b80940ff
  1. 3
      configure
  2. 2
      libavcodec/Makefile

3
configure vendored

@ -1088,6 +1088,9 @@ zlib_encoder_select="zlib"
zmbv_decoder_select="zlib" zmbv_decoder_select="zlib"
zmbv_encoder_select="zlib" zmbv_encoder_select="zlib"
# parsers
h264_parser_select="golomb"
# external libraries # external libraries
libamr_nb_decoder_deps="libamr_nb" libamr_nb_decoder_deps="libamr_nb"
libamr_nb_encoder_deps="libamr_nb" libamr_nb_encoder_deps="libamr_nb"

@ -407,7 +407,7 @@ OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o
OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o
OBJS-$(CONFIG_H261_PARSER) += h261_parser.o OBJS-$(CONFIG_H261_PARSER) += h261_parser.o
OBJS-$(CONFIG_H263_PARSER) += h263_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_MJPEG_PARSER) += mjpeg_parser.o
OBJS-$(CONFIG_MLP_PARSER) += mlp_parser.o mlp.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 OBJS-$(CONFIG_MPEG4VIDEO_PARSER) += mpeg4video_parser.o h263.o mpeg12data.o mpegvideo.o error_resilience.o

Loading…
Cancel
Save