summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-19 12:09:33 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-19 12:56:49 +0200
commitb06604604624050a1924be019611fec2ed7b4f73 (patch)
treecb9c1cb18fd592cad65b0cf7334ee2b2f7bfe5d4
parentb7c2358f6237af5f946168d486f72e33cecd7093 (diff)
downloadffmpeg-streaming-b06604604624050a1924be019611fec2ed7b4f73.zip
ffmpeg-streaming-b06604604624050a1924be019611fec2ed7b4f73.tar.gz
error_concealment: make sure mbaff flags are 0 as interlaced is not supported.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/error_resilience.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index b853a90..15c5b39 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);
OpenPOWER on IntegriCloud