From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 24 Jun 2013 14:05:19 +0000 (+0200)
Subject: h264: Fix null pointer dereference with disabled error concealment
X-Git-Tag: android-x86-4.4-r1~2739
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bbe26eff2235dc2d1c79a5a1e25b46d8d7f0fe08;p=android-x86%2Fexternal-ffmpeg.git

h264: Fix null pointer dereference with disabled error concealment

Fixes Ticket2551

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index bb105eeeb4..edd34aef5f 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4287,7 +4287,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
                     avctx->codec_id != AV_CODEC_ID_H264 ||
                     (CONFIG_GRAY && (h->flags & CODEC_FLAG_GRAY));
 
-    if (!(h->avctx->active_thread_type & FF_THREAD_SLICE) && h->picture_structure == PICT_FRAME) {
+    if (!(h->avctx->active_thread_type & FF_THREAD_SLICE) && h->picture_structure == PICT_FRAME && h->er.error_status_table) {
         const int start_i  = av_clip(h->resync_mb_x + h->resync_mb_y * h->mb_width, 0, h->mb_num - 1);
         if (start_i) {
             int prev_status = h->er.error_status_table[h->er.mb_index2xy[start_i - 1]];