diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:15 +0100 |
| commit | c377e04d8aa74d030672e9a4788a700b0695fc14 (patch) | |
| tree | 86171a6dca7f3e538cdc00ed02c92b5f7a1f4c75 /libavcodec/h264.h | |
| parent | 36d04801ba9d8622c2d759c172aea18561bac74d (diff) | |
| download | ffmpeg-c377e04d8aa74d030672e9a4788a700b0695fc14.tar.gz | |
h264: move top_borders into the per-slice context
Also change the method for allocating to the same one as used by
edge_emu_buffer.
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 2c41584450..ba4ee39ab4 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -401,8 +401,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. @@ -473,7 +475,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]; |