Commit 735e36a3 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Do not redundantly check for preprocessor definitions of CONFIG_RV10_ENCODER or

CONFIG_RV20_ENCODER when also checking for CONFIG_H263_ENCODER.
The RV10/RV20 encoders depend on the H.263 encoder.

Originally committed as revision 19593 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b2bf38b4
......@@ -36,8 +36,6 @@
#define CONFIG_ANY_H263_ENCODER (CONFIG_H263_ENCODER || \
CONFIG_H263P_ENCODER || \
CONFIG_FLV_ENCODER || \
CONFIG_RV10_ENCODER || \
CONFIG_RV20_ENCODER || \
CONFIG_MPEG4_ENCODER || \
CONFIG_MSMPEG4_ENCODER || \
CONFIG_WMV_ENCODER)
......
......@@ -1724,8 +1724,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x,
case CODEC_ID_FLV1:
case CODEC_ID_RV10:
case CODEC_ID_RV20:
if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER ||
CONFIG_FLV_ENCODER || CONFIG_RV10_ENCODER || CONFIG_RV20_ENCODER)
if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER || CONFIG_FLV_ENCODER)
h263_encode_mb(s, s->block, motion_x, motion_y);
break;
case CODEC_ID_MJPEG:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment