[FFmpeg-cvslog] configure: Add a dependency on vc1_decoder from vc1_parser

Martin Storsjö git at videolan.org
Mon Feb 2 20:41:30 CET 2015


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sun Feb  1 17:24:35 2015 +0200| [28df0151b6618226b05ee52e031af0b11ca531b0] | committer: Martin Storsjö

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 at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28df0151b6618226b05ee52e031af0b11ca531b0
---

 configure           |    2 +-
 libavcodec/Makefile |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 7c668d7..1d87816 100755
--- a/configure
+++ b/configure
@@ -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 8c0c345..bd38411 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
 



More information about the ffmpeg-cvslog mailing list