Mercurial > libavcodec.hg
diff mpegvideo_enc.c @ 5208:430f60820b21 libavcodec
split mpeg12 encoder out of mpeg12.c
| author | aurel |
|---|---|
| date | Thu, 05 Jul 2007 09:08:28 +0000 |
| parents | 1c3baf4323bb |
| children | 2ac10c5e5885 |
line wrap: on
line diff
--- a/mpegvideo_enc.c Thu Jul 05 06:47:02 2007 +0000 +++ b/mpegvideo_enc.c Thu Jul 05 09:08:28 2007 +0000 @@ -675,7 +675,8 @@ h263_encode_init(s); if (ENABLE_MSMPEG4_ENCODER && s->msmpeg4_version) ff_msmpeg4_encode_init(s); - if (s->out_format == FMT_MPEG1) + if ((ENABLE_MPEG1VIDEO_ENCODER || ENABLE_MPEG2VIDEO_ENCODER) + && s->out_format == FMT_MPEG1) ff_mpeg1_encode_init(s); /* init q matrix */ @@ -1685,6 +1686,7 @@ switch(s->codec_id){ //FIXME funct ptr could be slightly faster case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG2VIDEO: + if (ENABLE_MPEG1VIDEO_ENCODER || ENABLE_MPEG2VIDEO_ENCODER) mpeg1_encode_mb(s, s->block, motion_x, motion_y); break; case CODEC_ID_MPEG4: mpeg4_encode_mb(s, s->block, motion_x, motion_y); break; @@ -2146,8 +2148,10 @@ break; case CODEC_ID_MPEG1VIDEO: case CODEC_ID_MPEG2VIDEO: + if (ENABLE_MPEG1VIDEO_ENCODER || ENABLE_MPEG2VIDEO_ENCODER) { ff_mpeg1_encode_slice_header(s); ff_mpeg1_clean_buffers(s); + } break; case CODEC_ID_H263: case CODEC_ID_H263P: @@ -2873,6 +2877,7 @@ h263_encode_picture_header(s, picture_number); break; case FMT_MPEG1: + if (ENABLE_MPEG1VIDEO_ENCODER || ENABLE_MPEG2VIDEO_ENCODER) mpeg1_encode_picture_header(s, picture_number); break; case FMT_H264: