Mercurial > libavcodec.hg

comparison mpegvideo_enc.c @ 10034:ea2422aa4635 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not check for both CONFIG_H263_ENCODER and CONFIG_FLV_ENCODER. The latter can never be enabled without the former.
author diego
date Wed, 05 Aug 2009 15:27:22 +0000
parents 29c9829a9684
children 38cfe222e1a4
comparison
equal deleted inserted replaced
10033:3466a2a6fe06 10034:ea2422aa4635
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_FLV_ENCODER) 1727 if (CONFIG_H263_ENCODER)
1728 h263_encode_mb(s, s->block, motion_x, motion_y); 1728 h263_encode_mb(s, s->block, motion_x, motion_y);
1729 break; 1729 break;
1730 case CODEC_ID_MJPEG: 1730 case CODEC_ID_MJPEG:
1731 if (CONFIG_MJPEG_ENCODER) 1731 if (CONFIG_MJPEG_ENCODER)
1732 ff_mjpeg_encode_mb(s, s->block); 1732 ff_mjpeg_encode_mb(s, s->block);
2036 2036
2037 switch(s->codec_id){ 2037 switch(s->codec_id){
2038 case CODEC_ID_H263: 2038 case CODEC_ID_H263:
2039 case CODEC_ID_H263P: 2039 case CODEC_ID_H263P:
2040 case CODEC_ID_FLV1: 2040 case CODEC_ID_FLV1:
2041 if (CONFIG_H263_ENCODER || CONFIG_FLV_ENCODER) 2041 if (CONFIG_H263_ENCODER)
2042 s->gob_index = ff_h263_get_gob_height(s); 2042 s->gob_index = ff_h263_get_gob_height(s);
2043 break; 2043 break;
2044 case CODEC_ID_MPEG4: 2044 case CODEC_ID_MPEG4:
2045 if(CONFIG_MPEG4_ENCODER && s->partitioned_frame) 2045 if(CONFIG_MPEG4_ENCODER && s->partitioned_frame)
2046 ff_mpeg4_init_partitions(s); 2046 ff_mpeg4_init_partitions(s);
2680 ff_clean_mpeg4_qscales(s); 2680 ff_clean_mpeg4_qscales(s);
2681 break; 2681 break;
2682 case CODEC_ID_H263: 2682 case CODEC_ID_H263:
2683 case CODEC_ID_H263P: 2683 case CODEC_ID_H263P:
2684 case CODEC_ID_FLV1: 2684 case CODEC_ID_FLV1:
2685 if (CONFIG_H263_ENCODER || CONFIG_FLV_ENCODER) 2685 if (CONFIG_H263_ENCODER)
2686 ff_clean_h263_qscales(s); 2686 ff_clean_h263_qscales(s);
2687 break; 2687 break;
2688 } 2688 }
2689 2689
2690 s->lambda= s->lambda_table[0]; 2690 s->lambda= s->lambda_table[0];