diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:47:19 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:50:53 +0300 |
commit | 3d1d8e1f95e1cb6682a6dd035046d91a0812d331 (patch) | |
tree | 01ed80b8f00c484de9ed9330c802ce3407c6e45c /libavcodec/h264.h | |
parent | 27301633297f36549d94499b1c5728e1118a2b7c (diff) | |
parent | 36d04801ba9d8622c2d759c172aea18561bac74d (diff) |
Merge commit '36d04801ba9d8622c2d759c172aea18561bac74d'
* commit '36d04801ba9d8622c2d759c172aea18561bac74d':
h264: move the scratch buffers into the per-slice context
Conflicts:
libavcodec/h264.h
libavcodec/h264_slice.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index e7d5a304c9..49639ddd57 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -436,6 +436,11 @@ typedef struct H264SliceContext { const uint8_t *intra_pcm_ptr; + uint8_t *bipred_scratchpad; + uint8_t *edge_emu_buffer; + int bipred_scratchpad_allocated; + int edge_emu_buffer_allocated; + /** * non zero coeff count cache. * is 64 if not available. @@ -763,14 +768,11 @@ typedef struct H264Context { int initial_cpb_removal_delay[32]; ///< Initial timestamps for CPBs int cur_chroma_format_idc; - uint8_t *bipred_scratchpad; - int16_t slice_row[MAX_SLICES]; ///< to detect when MAX_SLICES is too low uint8_t parse_history[6]; int parse_history_count; int parse_last_mb; - uint8_t *edge_emu_buffer; int16_t *dc_val_base; AVBufferPool *qscale_table_pool; |