From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 28 Jun 2005 06:45:41 +0000 (+0000)
Subject: fixing first_mb_in_slice if frame_mbs_only_flag==0 && mb_aff==0
X-Git-Tag: v0.5~13762
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e679cd1ab0c45e2d31454b799f3e7c1b3aebbd02;p=platform%2Fupstream%2Flibav.git

fixing first_mb_in_slice if frame_mbs_only_flag==0 && mb_aff==0

Originally committed as revision 4402 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index f17c592..395ae1c 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4234,7 +4234,7 @@ static int decode_slice_header(H264Context *h){
             s->picture_structure= PICT_TOP_FIELD + get_bits1(&s->gb); //bottom_field_flag
         } else {
             s->picture_structure= PICT_FRAME;
-            first_mb_in_slice <<= 1;
+            first_mb_in_slice <<= h->sps.mb_aff;
             h->mb_aff_frame = h->sps.mb_aff;
         }
     }