diff options
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/vc1.c | 17 | ||||
-rw-r--r-- | libavcodec/vc1.h | 1 | ||||
-rw-r--r-- | libavcodec/vc1dec.c | 2 |
3 files changed, 14 insertions, 6 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c index c1b73d635a..fa0b916898 100644 --- a/libavcodec/vc1.c +++ b/libavcodec/vc1.c @@ -834,6 +834,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) int status; int mbmodetab, imvtab, icbptab, twomvbptab, fourmvbptab; /* useful only for debugging */ int scale, shift, i; /* for initializing LUT for intensity compensation */ + int field_mode, fcm; v->numref=0; v->p_frame_skipped = 0; @@ -848,19 +849,23 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, GetBitContext* gb) goto parse_common_info; } - v->field_mode = 0; + field_mode = 0; if (v->interlace) { - v->fcm = decode012(gb); - if (v->fcm) { - if (v->fcm == ILACE_FIELD) - v->field_mode = 1; + fcm = decode012(gb); + if (fcm) { + if (fcm == ILACE_FIELD) + field_mode = 1; if (!v->warn_interlaced++) av_log(v->s.avctx, AV_LOG_ERROR, "Interlaced frames/fields support is incomplete\n"); } } else { - v->fcm = PROGRESSIVE; + fcm = PROGRESSIVE; } + if (!v->first_pic_header_flag && v->field_mode != field_mode) + return -1; + v->field_mode = field_mode; + v->fcm = fcm; if (v->field_mode) { v->fptype = get_bits(gb, 3); diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 6263d1dc0b..4ed8923469 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -368,6 +368,7 @@ typedef struct VC1Context{ int qs_last; ///< if qpel has been used in the previous (tr.) picture int bmvtype; int frfd, brfd; ///< reference frame distance (forward or backward) + int first_pic_header_flag; int pic_header_flag; /** Frame decoding info for sprite modes */ diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 8fbdbdf2cb..b6d59c9948 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5516,6 +5516,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, // do parse frame header v->pic_header_flag = 0; + v->first_pic_header_flag = 1; if (v->profile < PROFILE_ADVANCED) { if (ff_vc1_parse_frame_header(v, &s->gb) < 0) { goto err; @@ -5525,6 +5526,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, goto err; } } + v->first_pic_header_flag = 0; if (avctx->debug & FF_DEBUG_PICT_INFO) av_log(v->s.avctx, AV_LOG_DEBUG, "pict_type: %c\n", av_get_picture_type_char(s->pict_type)); |