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 | |
| parent | 3810fbf56137cfbeacb1cae63500f4b08f9ddb48 (diff) | |
| download | ffmpeg-f01a18945567967aa1022d1a17ba0d88dad91a2a.tar.gz | |
cleanup
Originally committed as revision 1178 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/avcodec.h | 12 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 6 |
2 files changed, 12 insertions, 6 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dabb9c649c..b7a8e03fd1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5,8 +5,8 @@ #define LIBAVCODEC_VERSION_INT 0x000406 #define LIBAVCODEC_VERSION "0.4.6" -#define LIBAVCODEC_BUILD 4635 -#define LIBAVCODEC_BUILD_STR "4635" +#define LIBAVCODEC_BUILD 4636 +#define LIBAVCODEC_BUILD_STR "4636" enum CodecID { CODEC_ID_NONE, @@ -122,7 +122,6 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, #define CODEC_FLAG_4MV 0x0004 /* 4 MV per MB allowed */ #define CODEC_FLAG_QPEL 0x0010 /* use qpel MC */ #define CODEC_FLAG_GMC 0x0020 /* use GMC */ -#define CODEC_FLAG_TYPE 0x0040 /* fixed I/P frame type, from avctx->key_frame */ #define CODEC_FLAG_PART 0x0080 /* use data partitioning */ /* parent program gurantees that the input for b-frame containing streams is not written to for at least s->max_b_frames+1 frames, if this is not set than the input will be copied */ @@ -760,6 +759,13 @@ typedef struct AVCodecContext { * decoding: set by lavc */ int8_t *display_qscale_table; + + /** + * force specific pict_type. + * encoding; set by user (I/P/B_TYPE) + * decoding: unused + */ + int force_type; } AVCodecContext; typedef struct AVCodec { 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; |