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 (file)
--- 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;
         }
     }