From 4ca6f4b29c23747a6ea9b3e6151f254d0fa2d0d9 Mon Sep 17 00:00:00 2001 From: Stefan Gehrer Date: Tue, 10 Feb 2009 17:08:56 +0000 Subject: [PATCH] fix parsing of pic_structure Originally committed as revision 17136 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/cavsdec.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c index b4d3e978a..9e4958915 100644 --- a/libavcodec/cavsdec.c +++ b/libavcodec/cavsdec.c @@ -499,9 +499,10 @@ static int decode_pic(AVSContext *h) { if(s->low_delay) get_ue_golomb(&s->gb); //bbv_check_times h->progressive = get_bits1(&s->gb); - if(h->progressive) - h->pic_structure = 1; - else if(!(h->pic_structure = get_bits1(&s->gb) && (h->stc == PIC_PB_START_CODE)) ) + h->pic_structure = 1; + if(!h->progressive) + h->pic_structure = get_bits1(&s->gb); + if(!h->pic_structure && h->stc == PIC_PB_START_CODE) skip_bits1(&s->gb); //advanced_pred_mode_disable skip_bits1(&s->gb); //top_field_first skip_bits1(&s->gb); //repeat_first_field -- 2.11.0