On 20/01/14 19:18, Tim Walker wrote: > On 19 Jan 2014, at 17:38, Kostya Shishkov <[email protected]> wrote: > >> On Sun, Jan 19, 2014 at 05:28:25PM +0100, Tim Walker wrote: >>> From: Michael Niedermayer <[email protected]> >>> >>> Fixes an issue where the B-frame coding mode switches from interlaced >>> fields to interlaced frames, causing incorrect decisions in the motion >>> compensation code and resulting in visual artifacts. >>> >>> CC: [email protected] >>> Signed-off-by: Tim Walker <[email protected]> >>> --- >>> libavcodec/vc1.c | 3 +-- >>> 1 file changed, 1 insertion(+), 2 deletions(-) >>> >>> diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c >>> index acefce6..a7f2aab 100644 >>> --- a/libavcodec/vc1.c >>> +++ b/libavcodec/vc1.c >>> @@ -842,6 +842,7 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, >>> GetBitContext* gb) >>> int mbmodetab, imvtab, icbptab, twomvbptab, fourmvbptab; /* useful only >>> for debugging */ >>> int field_mode, fcm; >>> >>> + v->numref = 0; >>> v->p_frame_skipped = 0; >>> if (v->second_field) { >>> v->s.pict_type = (v->fptype & 1) ? AV_PICTURE_TYPE_P : >>> AV_PICTURE_TYPE_I; >>> @@ -1011,8 +1012,6 @@ int ff_vc1_parse_frame_header_adv(VC1Context *v, >>> GetBitContext* gb) >>> v->reffield = get_bits1(gb); >>> v->ref_field_type[0] = v->reffield ^ !v->cur_field_type; >>> } >>> - } else { >>> - v->numref = 0; >>> } >>> if (v->extended_mv) >>> v->mvrange = get_unary(gb, 0, 3); >>> -- >> >> LGTM > > Thanks. Any objections from someone else or should I just push it? >
Looks harmless and you tested it fixes some samples so it look ok to me as well. lu _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
