diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-06-09 20:29:52 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-06-09 20:29:52 +0000 |
| commit | 28b80940ff69c8d860e54dd326042f4bdc038fba (patch) | |
| tree | 314bebafc1eab3b184840454e0fcf9bbdbd43c67 | |
| parent | ef434a4b2431767a1be8de95259bc8c33645debe (diff) | |
| download | ffmpeg-28b80940ff69c8d860e54dd326042f4bdc038fba.tar.gz | |
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
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | libavcodec/Makefile | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2b675156fb..35bd0112b1 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -407,7 +407,7 @@ OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o 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 |