summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-12-29 17:16:07 +0000
committerDiego Biurrun <diego@biurrun.de>2009-12-29 17:16:07 +0000
commitc46b024ed3923e47d5ccc94207f985c21a308e32 (patch)
treeec392300135a366582e0cf2a5d5a38016aceafcd
parent2cca233bc988f386ccd80c59b78c4db154c88955 (diff)
Neither the H.264 nor the SVQ3 decoder depend on the H.264 parser.
Originally committed as revision 20967 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 5210d4870c..16502f1c64 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -130,8 +130,7 @@ OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o
OBJS-$(CONFIG_H263_ENCODER) += mpegvideo_enc.o motion_est.o \
ratecontrol.o h263.o mpeg12data.o \
mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o \
- h264_parser.o cabac.o \
+OBJS-$(CONFIG_H264_DECODER) += h264.o h264idct.o h264pred.o cabac.o \
mpegvideo.o error_resilience.o
OBJS-$(CONFIG_H264_ENCODER) += h264enc.o h264dspenc.o
OBJS-$(CONFIG_H264_VAAPI_HWACCEL) += vaapi_h264.o
@@ -279,7 +278,7 @@ OBJS-$(CONFIG_SVQ1_ENCODER) += svq1enc.o svq1.o \
motion_est.o h263.o \
mpegvideo.o error_resilience.o
OBJS-$(CONFIG_SVQ3_DECODER) += h264.o h264idct.o h264pred.o \
- h264_parser.o cabac.o \
+ cabac.o \
mpegvideo.o error_resilience.o \
svq1dec.o svq1.o h263.o
OBJS-$(CONFIG_TARGA_DECODER) += targa.o