virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

h264: allocate some tables per slice contexts, not threads

Browse Source 
This is more correct and avoids wasting space when frame threading is
used.
This commit is contained in:
Anton Khirnov
2016-04-13 17:31:27 +02:00
parent e065279529
commit e3c9041cfe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@@ -162,7 +162,7 @@ void ff_h264_free_tables(H264Context *h)
int ff_h264_alloc_tables(H264Context *h) int ff_h264_alloc_tables(H264Context *h)
{ {
const int big_mb_num = h->mb_stride * (h->mb_height + 1); const int big_mb_num = h->mb_stride * (h->mb_height + 1);
const int row_mb_num = h->mb_stride * 2 * h->avctx->thread_count; const int row_mb_num = h->mb_stride * 2 * h->nb_slice_ctx;
int x, y; int x, y;
FF_ALLOCZ_OR_GOTO(h->avctx, h->intra4x4_pred_mode, FF_ALLOCZ_OR_GOTO(h->avctx, h->intra4x4_pred_mode,