diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-01 00:39:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-01 00:46:05 +0100 |
| commit | 099d6813c27faf95257a529aa2c65dfde816a487 (patch) | |
| tree | 35292d189aee6e5622763e01cac7b5aa1a178066 /libavcodec/h264.c | |
| parent | ca0350f49b82663123f7fb4fddcafa7c874a96a4 (diff) | |
| download | ffmpeg-099d6813c27faf95257a529aa2c65dfde816a487.tar.gz | |
svq3: Fix memory corruption introduced by automatic thread_count.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |