summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2009-12-28 17:45:31 +0000
committerDiego Biurrun <diego@biurrun.de>2009-12-28 17:45:31 +0000
commit7f647ae0b173d8d462c0dabce74c5d1157d2dc44 (patch)
tree702990621a41f2447b06f5fb83014c5ac16239cf
parentf34121f3511dd7b02c4353b32d9458fad1772e38 (diff)
Declare the dependency of the H.263 decoder on the H.263 parser in configure.
Originally committed as revision 20951 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure1
-rw-r--r--libavcodec/Makefile2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 7b85fa8b1a..319b7d7410 100755
--- a/configure
+++ b/configure
@@ -1105,6 +1105,7 @@ flashsv_decoder_select="zlib"
flashsv_encoder_select="zlib"
flv_encoder_select="h263_encoder"
h261_encoder_select="aandct"
+h263_decoder_select="h263_parser"
h263_encoder_select="aandct"
h263_vaapi_hwaccel_deps="va_va_h"
h263_vaapi_hwaccel_select="vaapi h263_decoder"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 35a4ce5768..bc5fc67da1 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -129,7 +129,7 @@ OBJS-$(CONFIG_H261_ENCODER) += h261enc.o h261.o \
mpegvideo_enc.o motion_est.o \
ratecontrol.o mpeg12data.o \
mpegvideo.o
-OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o h263_parser.o \
+OBJS-$(CONFIG_H263_DECODER) += h263dec.o h263.o \
mpegvideo.o error_resilience.o
OBJS-$(CONFIG_H263_VAAPI_HWACCEL) += vaapi_mpeg4.o
OBJS-$(CONFIG_H263I_DECODER) += h263dec.o h263.o \