From b06604604624050a1924be019611fec2ed7b4f73 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 19 Apr 2012 12:09:33 +0200
Subject: [PATCH] error_concealment: make sure mbaff flags are 0 as interlaced
 is not supported.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavcodec/error_resilience.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index b853a90e2a..15c5b39329 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -65,7 +65,8 @@ static void decode_mb(MpegEncContext *s, int ref)
         fill_rectangle(&h->ref_cache[0][scan8[0]], 4, 4, 8, ref, 1);
         fill_rectangle(h->mv_cache[0][scan8[0]], 4, 4, 8,
                        pack16to32(s->mv[0][0][0], s->mv[0][0][1]), 4);
-        assert(!FRAME_MBAFF);
+        h->mb_mbaff =
+        h->mb_field_decoding_flag = 0;
         ff_h264_hl_decode_mb(h);
     } else {
         assert(ref == 0);