diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-01-24 15:26:15 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-24 17:49:27 +0100 |
commit | 77140279d33006f1d949ee3717af67204dc519c6 (patch) | |
tree | 6aa58cd50be6c35024ec0970e2dac48e663bf2ab | |
parent | 1296dc6025dec85547006ffc60640153a1692b76 (diff) | |
download | ffmpeg-77140279d33006f1d949ee3717af67204dc519c6.tar.gz |
hevc: pass the full HEVCNAL struct to decode_nal_unit
This enables decode_nal_unit to access additional fields added in
subsequent commits.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/hevc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 2bd89ec3f9..8f60b3d736 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2580,13 +2580,13 @@ fail: return ret; } -static int decode_nal_unit(HEVCContext *s, const uint8_t *nal, int length) +static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal) { HEVCLocalContext *lc = s->HEVClc; GetBitContext *gb = &lc->gb; int ctb_addr_ts, ret; - ret = init_get_bits8(gb, nal, length); + ret = init_get_bits8(gb, nal->data, nal->size); if (ret < 0) return ret; @@ -2685,7 +2685,7 @@ static int decode_nal_unit(HEVCContext *s, const uint8_t *nal, int length) } if (s->threads_number > 1 && s->sh.num_entry_point_offsets > 0) - ctb_addr_ts = hls_slice_data_wpp(s, nal, length); + ctb_addr_ts = hls_slice_data_wpp(s, nal->data, nal->size); else ctb_addr_ts = hls_slice_data(s); if (ctb_addr_ts >= (s->sps->ctb_width * s->sps->ctb_height)) { @@ -2937,7 +2937,7 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) s->skipped_bytes = s->skipped_bytes_nal[i]; s->skipped_bytes_pos = s->skipped_bytes_pos_nal[i]; - ret = decode_nal_unit(s, s->nals[i].data, s->nals[i].size); + ret = decode_nal_unit(s, &s->nals[i]); if (ret < 0) { av_log(s->avctx, AV_LOG_WARNING, "Error parsing NAL unit #%d.\n", i); |