diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-05-16 09:34:44 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-06-21 11:07:10 +0200 |
| commit | b25cd7540e7cba9868edc13817c0ce1ddef90ffc (patch) | |
| tree | 0945e2f96c5887ce1107735182442e229187dd1a /libavcodec/h264.h | |
| parent | 523c4c5b70994f5cd1f192b68d07cf24b292ca05 (diff) | |
h264: pass a H2645NAL to slice header decoding
Replace the decoder-global nal_unit_type/nal_ref_idc variables with the
per-NAL ones. The decoder-global ones still cannot be removed because
they are used by hwaccels.
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 3fdd3bcd90..6cd2506e6f 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -929,7 +929,8 @@ int ff_h264_slice_context_init(H264Context *h, H264SliceContext *sl); void ff_h264_draw_horiz_band(const H264Context *h, H264SliceContext *sl, int y, int height); -int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl); +int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, + const H2645NAL *nal); int ff_h264_execute_decode_slices(H264Context *h, unsigned context_count); int ff_h264_update_thread_context(AVCodecContext *dst, const AVCodecContext *src); |