diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:58:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 18:58:59 +0100 |
| commit | 44e4a86c8afca4ac1f7498ff4419364b839a15f9 (patch) | |
| tree | a06e9c5d2a9a9682615c2ad1bdf49ddb765d65f2 /libavcodec/h264.h | |
| parent | 3d1d8e1f95e1cb6682a6dd035046d91a0812d331 (diff) | |
| parent | c377e04d8aa74d030672e9a4788a700b0695fc14 (diff) | |
| download | ffmpeg-44e4a86c8afca4ac1f7498ff4419364b839a15f9.tar.gz | |
Merge commit 'c377e04d8aa74d030672e9a4788a700b0695fc14'
* commit 'c377e04d8aa74d030672e9a4788a700b0695fc14':
h264: move top_borders into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 49639ddd57..f1fbbe4e91 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -438,8 +438,10 @@ typedef struct H264SliceContext { uint8_t *bipred_scratchpad; uint8_t *edge_emu_buffer; + uint8_t (*top_borders[2])[(16 * 3) * 2]; int bipred_scratchpad_allocated; int edge_emu_buffer_allocated; + int top_borders_allocated[2]; /** * non zero coeff count cache. @@ -512,7 +514,6 @@ typedef struct H264Context { int8_t(*intra4x4_pred_mode); H264PredContext hpc; - uint8_t (*top_borders[2])[(16 * 3) * 2]; uint8_t (*non_zero_count)[48]; |