generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not check for both CONFIG_H263_ENCODER and CONFIG_FLV_ENCODER.

Browse Source 
The latter can never be enabled without the former.

Originally committed as revision 19598 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2009-08-05 15:27:22 +00:00
parent 4d4b4bd149
commit 0bd485300e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mpegvideo_enc.c
View File

@ -1724,7 +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_FLV_ENCODER) if (CONFIG_H263_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:
@ -2038,7 +2038,7 @@ static int encode_thread(AVCodecContext *c, void *arg){
case CODEC_ID_H263: case CODEC_ID_H263:
case CODEC_ID_H263P: case CODEC_ID_H263P:
case CODEC_ID_FLV1: case CODEC_ID_FLV1:
if (CONFIG_H263_ENCODER || CONFIG_FLV_ENCODER) if (CONFIG_H263_ENCODER)
s->gob_index = ff_h263_get_gob_height(s); s->gob_index = ff_h263_get_gob_height(s);
break; break;
case CODEC_ID_MPEG4: case CODEC_ID_MPEG4:
@ -2682,7 +2682,7 @@ static int estimate_qp(MpegEncContext *s, int dry_run){
case CODEC_ID_H263: case CODEC_ID_H263:
case CODEC_ID_H263P: case CODEC_ID_H263P:
case CODEC_ID_FLV1: case CODEC_ID_FLV1:
if (CONFIG_H263_ENCODER || CONFIG_FLV_ENCODER) if (CONFIG_H263_ENCODER)
ff_clean_h263_qscales(s); ff_clean_h263_qscales(s);
break; break;
} }