RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Diego Biurrun 2009-08-05 10:46:43 +00:00
parent b2bf38b446
commit 735e36a3e4
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h263.h
View File

@ -36,8 +36,6 @@
#define CONFIG_ANY_H263_ENCODER (CONFIG_H263_ENCODER || \ #define CONFIG_ANY_H263_ENCODER (CONFIG_H263_ENCODER || \
CONFIG_H263P_ENCODER || \ CONFIG_H263P_ENCODER || \
CONFIG_FLV_ENCODER || \ CONFIG_FLV_ENCODER || \
CONFIG_RV10_ENCODER || \
CONFIG_RV20_ENCODER || \
CONFIG_MPEG4_ENCODER || \ CONFIG_MPEG4_ENCODER || \
CONFIG_MSMPEG4_ENCODER || \ CONFIG_MSMPEG4_ENCODER || \
CONFIG_WMV_ENCODER) CONFIG_WMV_ENCODER)

3
libavcodec/mpegvideo_enc.c
View File

@ -1724,8 +1724,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, int motion_x,
case CODEC_ID_FLV1: case CODEC_ID_FLV1:
case CODEC_ID_RV10: case CODEC_ID_RV10:
case CODEC_ID_RV20: case CODEC_ID_RV20:
if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER || if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER || CONFIG_FLV_ENCODER)
CONFIG_FLV_ENCODER || CONFIG_RV10_ENCODER || CONFIG_RV20_ENCODER)
h263_encode_mb(s, s->block, motion_x, motion_y); h263_encode_mb(s, s->block, motion_x, motion_y);
break; break;
case CODEC_ID_MJPEG: case CODEC_ID_MJPEG: