diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-08-05 10:46:43 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-08-05 10:46:43 +0000 |
| commit | 735e36a3e4427b009f27d27baa7541f686c180d4 (patch) | |
| tree | 68556557a15424f53f44602c91f745b90392ae54 | |
| parent | b2bf38b4461f7466d80ef4a96c06ed4b3b249322 (diff) | |
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
| -rw-r--r-- | libavcodec/h263.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/libavcodec/h263.h b/libavcodec/h263.h index fcd821c74c..b89bf1b923 100644 --- a/libavcodec/h263.h +++ b/libavcodec/h263.h @@ -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) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index c72f41204b..d62420af2f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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: |