Commit bbe26eff authored by Michael Niedermayer's avatar Michael Niedermayer

h264: Fix null pointer dereference with disabled error concealment

Fixes Ticket2551
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent a46e578d
...@@ -4287,7 +4287,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) ...@@ -4287,7 +4287,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg)
avctx->codec_id != AV_CODEC_ID_H264 || avctx->codec_id != AV_CODEC_ID_H264 ||
(CONFIG_GRAY && (h->flags & CODEC_FLAG_GRAY)); (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); 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) { if (start_i) {
int prev_status = h->er.error_status_table[h->er.mb_index2xy[start_i - 1]]; int prev_status = h->er.error_status_table[h->er.mb_index2xy[start_i - 1]];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment