diff options
| author | Martin Storsjö <martin@martin.st> | 2015-02-01 17:24:35 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2015-02-02 15:30:54 +0200 |
| commit | 28df0151b6618226b05ee52e031af0b11ca531b0 (patch) | |
| tree | 001711341a8bc391e6dd92a16104b9ce9377046d | |
| parent | 60392480181f24ebf3ab48d8ac3614705de90152 (diff) | |
| download | ffmpeg-28df0151b6618226b05ee52e031af0b11ca531b0.tar.gz | |
configure: Add a dependency on vc1_decoder from vc1_parser
This fixes builds with vc1_parser enabled without vc1_decoder. All
the vc1_decoder object files were included in the vc1_parser line
in libavcodec/Makefile before, but architecture specific object files
for vc1_decoder were not.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 4 |
2 files changed, 2 insertions, 4 deletions
@@ -1987,7 +1987,7 @@ wmv3_vdpau_hwaccel_select="vc1_vdpau_hwaccel" h264_parser_select="h264_decoder" mpegvideo_parser_select="mpegvideo" mpeg4video_parser_select="error_resilience h263dsp mpeg_er mpegvideo qpeldsp" -vc1_parser_select="mpegvideo startcode" +vc1_parser_select="mpegvideo startcode vc1_decoder" # external libraries libfaac_encoder_deps="libfaac" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 8c0c345e10..bd38411d77 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -679,9 +679,7 @@ OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o -OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o vc1dsp.o \ - msmpeg4.o msmpeg4data.o mpeg4video.o \ - h263.o +OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o OBJS-$(CONFIG_VP3_PARSER) += vp3_parser.o OBJS-$(CONFIG_VP8_PARSER) += vp8_parser.o |