diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:10:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 20:16:21 +0100 |
| commit | 84ae7294cbaa413b80d632f79d539270dd4bd6b5 (patch) | |
| tree | e44e4c10830565c3072d871405c57a64661eef85 /libavcodec/h264.h | |
| parent | 830e548b9ec32ad7ab02be056db15cbcf3c58346 (diff) | |
| parent | 3178f4d33ff62243f7cdddb081db516ea34396c9 (diff) | |
Merge commit '3178f4d33ff62243f7cdddb081db516ea34396c9'
* commit '3178f4d33ff62243f7cdddb081db516ea34396c9':
h264: move rbsp_buffer into the per-slice context
Conflicts:
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/h264_slice.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 5793f0e471..2df2dfa306 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -476,6 +476,10 @@ typedef struct H264SliceContext { CABACContext cabac; uint8_t cabac_state[1024]; int cabac_init_idc; + + // rbsp buffer used for this slice + uint8_t *rbsp_buffer; + unsigned int rbsp_buffer_size; } H264SliceContext; /** @@ -585,8 +589,6 @@ typedef struct H264Context { int nal_ref_idc; int nal_unit_type; - uint8_t *rbsp_buffer; - unsigned int rbsp_buffer_size; /** * Used to parse AVC variant of h264 @@ -817,7 +819,7 @@ int ff_h264_decode_picture_parameter_set(H264Context *h, int bit_length); * or a decode rbsp tailing? * @return decoded bytes, might be src+1 if no escapes */ -const uint8_t *ff_h264_decode_nal(H264Context *h, const uint8_t *src, +const uint8_t *ff_h264_decode_nal(H264Context *h, H264SliceContext *sl, const uint8_t *src, int *dst_length, int *consumed, int length); /** |