diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 10:28:14 +0200 |
|---|---|---|
| committer | Clément Bœsch <clement@stupeflix.com> | 2016-06-21 10:28:14 +0200 |
| commit | dea0a2b69aefe2310bd92539dde596cc8fc195e2 (patch) | |
| tree | f94e5af64a2e68b25cabfb290b5ff97e73391a28 /libavcodec/h264.c | |
| parent | 04aefe205b285a07646c99a834dcea04cd8a0110 (diff) | |
| parent | e3c9041cfe2e6526802255583d27abf9a921863e (diff) | |
| download | ffmpeg-dea0a2b69aefe2310bd92539dde596cc8fc195e2.tar.gz | |
Merge commit 'e3c9041cfe2e6526802255583d27abf9a921863e'
* commit 'e3c9041cfe2e6526802255583d27abf9a921863e':
h264: allocate some tables per slice contexts, not threads
Merged-by: Clément Bœsch <clement@stupeflix.com>
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 9292168da3..067f132f02 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -180,7 +180,7 @@ void ff_h264_free_tables(H264Context *h) int ff_h264_alloc_tables(H264Context *h) { const int big_mb_num = h->mb_stride * (h->mb_height + 1); - const int row_mb_num = 2*h->mb_stride*FFMAX(h->avctx->thread_count, 1); + const int row_mb_num = 2*h->mb_stride*FFMAX(h->nb_slice_ctx, 1); int x, y; FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->intra4x4_pred_mode, |