On Fri, Jul 27, 2012 at 06:49:40PM +0600, Mashiat Sarker Shakkhar wrote: > From: Michael Niedermayer <[email protected]> > > Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind > Signed-off-by: Michael Niedermayer <[email protected]> > --- > libavcodec/vc1dec.c | 14 ++++++++++---- > 1 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c > index b76fc76..ac5bfe5 100644 > --- a/libavcodec/vc1dec.c > +++ b/libavcodec/vc1dec.c > @@ -5579,11 +5579,17 @@ static int vc1_decode_frame(AVCodecContext *avctx, > void *data, > } > if (i) { > v->pic_header_flag = 0; > - if (v->field_mode && i == n_slices1 + 2) > - ff_vc1_parse_frame_header_adv(v, &s->gb); > - else if (get_bits1(&s->gb)) { > + if (v->field_mode && i == n_slices1 + 2) { > + if (ff_vc1_parse_frame_header_adv(v, &s->gb) < 0) { > + av_log(v->s.avctx, AV_LOG_ERROR, "slice header > damaged\n"); > + continue; > + } > + } else if (get_bits1(&s->gb)) { > v->pic_header_flag = 1; > - ff_vc1_parse_frame_header_adv(v, &s->gb); > + if (ff_vc1_parse_frame_header_adv(v, &s->gb) < 0) { > + av_log(v->s.avctx, AV_LOG_ERROR, "slice header > damaged\n"); > + continue; > + } > } > } > s->start_mb_y = (i == 0) ? 0 : FFMAX(0, slices[i-1].mby_start % > mb_height); > --
looks OK though I'd not make genitive out of the function name in the commit message _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
