Make H.263+ (H263P) encoder depend on H.263 encoder in configure.

Originally committed as revision 19595 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index cdf017d..b101c12 100755 (executable)
--- a/configure
+++ b/configure
@@ -1073,7 +1073,7 @@ h261_encoder_select="aandct"
 h263_encoder_select="aandct"
 h263_vaapi_hwaccel_deps="va_va_h"
 h263_vaapi_hwaccel_select="vaapi h263_decoder"
-h263p_encoder_select="aandct"
+h263p_encoder_select="h263_encoder"
 h264_decoder_select="golomb"
 h264_vaapi_hwaccel_deps="va_va_h"
 h264_vaapi_hwaccel_select="vaapi"

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2807c74..027c1ed 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -106,7 +106,6 @@ OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o h263_parser.o mpegvid
 OBJS-$(CONFIG_H263_VAAPI_HWACCEL)      += vaapi_mpeg4.o
 OBJS-$(CONFIG_H263I_DECODER)           += h263dec.o h263.o mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_H263_ENCODER)            += mpegvideo_enc.o motion_est.o ratecontrol.o h263.o mpeg12data.o mpegvideo.o error_resilience.o
-OBJS-$(CONFIG_H263P_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 mpegvideo.o error_resilience.o
 OBJS-$(CONFIG_H264_ENCODER)            += h264enc.o h264dspenc.o
 OBJS-$(CONFIG_HUFFYUV_DECODER)         += huffyuv.o