diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:57:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:57:21 +0100 |
| commit | c9841c05be67908e0980dafe0f7585ba47cbfe28 (patch) | |
| tree | 962eb94bdac044eb1bf6f054d0c1f85f158190ec /libavcodec/h264.c | |
| parent | a4952e7343f9a77d2995d699ac045b095ab11052 (diff) | |
| parent | a67f8ae9a2c8529bf6a635e8ca4e3483592708b1 (diff) | |
| download | ffmpeg-c9841c05be67908e0980dafe0f7585ba47cbfe28.tar.gz | |
Merge commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1'
* commit 'a67f8ae9a2c8529bf6a635e8ca4e3483592708b1':
h264: move mvd_table into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1849cc32d2..74ef9612ec 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -449,6 +449,9 @@ int ff_h264_alloc_tables(H264Context *h) row_mb_num, 16 * sizeof(uint8_t), fail); FF_ALLOCZ_ARRAY_OR_GOTO(h->avctx, h->mvd_table[1], row_mb_num, 16 * sizeof(uint8_t), fail); + h->slice_ctx[0].mvd_table[0] = h->mvd_table[0]; + h->slice_ctx[0].mvd_table[1] = h->mvd_table[1]; + FF_ALLOCZ_OR_GOTO(h->avctx, h->direct_table, 4 * big_mb_num * sizeof(uint8_t), fail); FF_ALLOCZ_OR_GOTO(h->avctx, h->list_counts, |