highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source 
Originally committed as revision 1178 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2002-11-09 10:38:34 +00:00
parent 3810fbf561
commit f01a189455
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/avcodec.h
View File

@ -5,8 +5,8 @@
#define LIBAVCODEC_VERSION_INT 0x000406 #define LIBAVCODEC_VERSION_INT 0x000406
#define LIBAVCODEC_VERSION "0.4.6" #define LIBAVCODEC_VERSION "0.4.6"
#define LIBAVCODEC_BUILD 4635 #define LIBAVCODEC_BUILD 4636
#define LIBAVCODEC_BUILD_STR "4635" #define LIBAVCODEC_BUILD_STR "4636"
enum CodecID { enum CodecID {
CODEC_ID_NONE, 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_4MV 0x0004 /* 4 MV per MB allowed */
#define CODEC_FLAG_QPEL 0x0010 /* use qpel MC */ #define CODEC_FLAG_QPEL 0x0010 /* use qpel MC */
#define CODEC_FLAG_GMC 0x0020 /* use GMC */ #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 */ #define CODEC_FLAG_PART 0x0080 /* use data partitioning */
/* parent program gurantees that the input for b-frame containing streams is not written to /* 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 */ 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 * decoding: set by lavc
*/ */
int8_t *display_qscale_table; int8_t *display_qscale_table;
/**
* force specific pict_type.
* encoding; set by user (I/P/B_TYPE)
* decoding: unused
*/
int force_type;
} AVCodecContext; } AVCodecContext;
typedef struct AVCodec { typedef struct AVCodec {

4
libavcodec/mpegvideo.c
View File

@ -996,9 +996,9 @@ int MPV_encode_picture(AVCodecContext *avctx,
init_put_bits(&s->pb, buf, buf_size, NULL, NULL); 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->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){ }else if(s->flags&CODEC_FLAG_PASS2){
s->input_pict_type= s->input_pict_type=
s->force_input_type= s->rc_context.entry[s->input_picture_number].new_pict_type; s->force_input_type= s->rc_context.entry[s->input_picture_number].new_pict_type;