diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-11-09 10:38:34 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-09 10:38:34 +0000 |
| commit | f01a18945567967aa1022d1a17ba0d88dad91a2a (patch) | |
| tree | 684970338d6c03e9ffde683e7d9bb3facae4d284 /libavcodec/mpegvideo.c | |
| parent | 3810fbf56137cfbeacb1cae63500f4b08f9ddb48 (diff) | |
| download | ffmpeg-f01a18945567967aa1022d1a17ba0d88dad91a2a.tar.gz | |
cleanup
Originally committed as revision 1178 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 5ca2727c8b..4f139806b7 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -410,7 +410,7 @@ int MPV_common_init(MpegEncContext *s) /* divx501 bitstream reorder buffer */ CHECKED_ALLOCZ(s->bitstream_buffer, BITSTREAM_BUFFER_SIZE); - + /* cbp, ac_pred, pred_dir */ CHECKED_ALLOCZ(s->cbp_table , s->mb_num * sizeof(UINT8)) CHECKED_ALLOCZ(s->pred_dir_table, s->mb_num * sizeof(UINT8)) @@ -996,9 +996,9 @@ int MPV_encode_picture(AVCodecContext *avctx, init_put_bits(&s->pb, buf, buf_size, NULL, NULL); - if(avctx->flags&CODEC_FLAG_TYPE){ + if(avctx->force_type){ s->input_pict_type= - s->force_input_type= avctx->key_frame ? I_TYPE : P_TYPE; + s->force_input_type= avctx->force_type; }else if(s->flags&CODEC_FLAG_PASS2){ s->input_pict_type= s->force_input_type= s->rc_context.entry[s->input_picture_number].new_pict_type; |