From 099d6813c27faf95257a529aa2c65dfde816a487 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 1 Jan 2012 00:39:29 +0100 Subject: [PATCH] svq3: Fix memory corruption introduced by automatic thread_count. Signed-off-by: Michael Niedermayer --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index f6fcc84eaa..9ec8bd9c88 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -968,7 +968,7 @@ static void init_dequant_tables(H264Context *h){ int ff_h264_alloc_tables(H264Context *h){ MpegEncContext * const s = &h->s; const int big_mb_num= s->mb_stride * (s->mb_height+1); - const int row_mb_num= 2*s->mb_stride*s->avctx->thread_count; + const int row_mb_num= 2*s->mb_stride*FFMAX(s->avctx->thread_count, 1); int x,y; FF_ALLOCZ_OR_GOTO(h->s.avctx, h->intra4x4_pred_mode, row_mb_num * 8 * sizeof(uint8_t), fail)