From 69cc31832f47f00be8cac9c2c97a04ebb4844dec Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 17 Feb 2010 02:14:02 +0000
Subject: Move check for and call of predict_field_decoding_flag() from the mb
 code to the row code. This function would only be needed on a MB basis for
 MBAFF+FMO

Originally committed as revision 21860 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/h264.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libavcodec/h264.c')

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 604c29e273..62ee92090a 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2257,6 +2257,8 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){
                 ++s->mb_y;
                 if(FIELD_OR_MBAFF_PICTURE) {
                     ++s->mb_y;
+                    if(FRAME_MBAFF && s->mb_y < s->mb_height)
+                        predict_field_decoding_flag(h);
                 }
             }
 
@@ -2295,6 +2297,8 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg){
                 ++s->mb_y;
                 if(FIELD_OR_MBAFF_PICTURE) {
                     ++s->mb_y;
+                    if(FRAME_MBAFF && s->mb_y < s->mb_height)
+                        predict_field_decoding_flag(h);
                 }
                 if(s->mb_y >= s->mb_height){
                     tprintf(s->avctx, "slice end %d %d\n", get_bits_count(&s->gb), s->gb.size_in_bits);
-- 
cgit v1.2.3