virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context

Browse Source
This commit is contained in:
Anton Khirnov 2013-11-29 22:26:15 +01:00
parent ff300e435e
commit a097f0049b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/mpeg12dec.c
View File

@ -52,6 +52,7 @@ typedef struct Mpeg1Context {
AVRational frame_rate_ext; ///< MPEG-2 specific framerate modificator
int sync; ///< Did we reach a sync point like a GOP/SEQ/KEYFrame?
int closed_gop; ///< GOP is closed
int first_slice;
int extradata_decoded;
} Mpeg1Context;
@ -2243,7 +2244,7 @@ static int decode_chunks(AVCodecContext *avctx,
/* we have a complete image: we try to decompress it */
if (mpeg1_decode_picture(avctx, buf_ptr, input_size) < 0)
s2->pict_type = 0;
s2->first_slice = 1;
s->first_slice = 1;
last_code = PICTURE_START_CODE;
} else {
av_log(avctx, AV_LOG_ERROR, "ignoring pic after %X\n", last_code);
@ -2353,9 +2354,9 @@ static int decode_chunks(AVCodecContext *avctx,
break;
}
if (s2->first_slice) {
if (s->first_slice) {
skip_frame = 0;
s2->first_slice = 0;
s->first_slice = 0;
if (mpeg_field_start(s2, buf, buf_size) < 0)
return -1;
}

1
libavcodec/mpegvideo.h
View File

@ -668,7 +668,6 @@ typedef struct MpegEncContext {
int progressive_frame;
int full_pel[2];
int interlaced_dct;
int first_slice;
int first_field; ///< is 1 for the first field of a field picture 0 otherwise
int drop_frame_timecode; ///< timecode is in drop frame format.
int scan_offset; ///< reserve space for SVCD scan offset user data.