return 0;
}
-static int hls_slice_data_wpp(HEVCContext *s, const HEVCNAL *nal)
+static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal)
{
const uint8_t *data = nal->data;
int length = nal->size;
return ret;
}
-static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal)
+static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal)
{
HEVCLocalContext *lc = s->HEVClc;
GetBitContext *gb = &lc->gb;
/* split the input packet into NAL units, so we know the upper bound on the
* number of slices in the frame */
- ret = ff_hevc_split_packet(s, &s->pkt, buf, length, s->avctx, s->is_nalff,
- s->nal_length_size);
+ ret = ff_h2645_packet_split(&s->pkt, buf, length, s->avctx, s->is_nalff,
+ s->nal_length_size, s->avctx->codec_id);
if (ret < 0) {
av_log(s->avctx, AV_LOG_ERROR,
"Error splitting the input into NAL units.\n");
s->HEVClc = NULL;
av_freep(&s->HEVClcList[0]);
- for (i = 0; i < s->pkt.nals_allocated; i++) {
- av_freep(&s->pkt.nals[i].rbsp_buffer);
- av_freep(&s->pkt.nals[i].skipped_bytes_pos);
- }
- av_freep(&s->pkt.nals);
- s->pkt.nals_allocated = 0;
+ ff_h2645_packet_uninit(&s->pkt);
return 0;
}