Mercurial > libavcodec.hg
comparison mpegvideo_enc.c @ 10029:67a1b27648b2 libavcodec
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.
author | diego |
---|---|
date | Wed, 05 Aug 2009 10:46:43 +0000 |
parents | fef7b43f0d22 |
children | 29c9829a9684 |
comparison
equal
deleted
inserted
replaced
10028:f9f378b1c145 | 10029:67a1b27648b2 |
---|---|
1722 case CODEC_ID_H263: | 1722 case CODEC_ID_H263: |
1723 case CODEC_ID_H263P: | 1723 case CODEC_ID_H263P: |
1724 case CODEC_ID_FLV1: | 1724 case CODEC_ID_FLV1: |
1725 case CODEC_ID_RV10: | 1725 case CODEC_ID_RV10: |
1726 case CODEC_ID_RV20: | 1726 case CODEC_ID_RV20: |
1727 if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER || | 1727 if (CONFIG_H263_ENCODER || CONFIG_H263P_ENCODER || CONFIG_FLV_ENCODER) |
1728 CONFIG_FLV_ENCODER || CONFIG_RV10_ENCODER || CONFIG_RV20_ENCODER) | |
1729 h263_encode_mb(s, s->block, motion_x, motion_y); | 1728 h263_encode_mb(s, s->block, motion_x, motion_y); |
1730 break; | 1729 break; |
1731 case CODEC_ID_MJPEG: | 1730 case CODEC_ID_MJPEG: |
1732 if (CONFIG_MJPEG_ENCODER) | 1731 if (CONFIG_MJPEG_ENCODER) |
1733 ff_mjpeg_encode_mb(s, s->block); | 1732 ff_mjpeg_encode_mb(s, s->block); |