diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 13:38:45 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 13:56:47 +0100 |
| commit | 3c4ca4c5d7992e545a6cbad440287f9e27f1a696 (patch) | |
| tree | 110fffd8d88093550fa8a023e513542ac4742fda /libavcodec/hevc.c | |
| parent | 492d229303a8d4270eda4d3be0e45d9e0caad0a8 (diff) | |
| parent | fa936a307f5cddfc2664600157a8207ca8080af6 (diff) | |
| download | ffmpeg-3c4ca4c5d7992e545a6cbad440287f9e27f1a696.tar.gz | |
Merge commit 'fa936a307f5cddfc2664600157a8207ca8080af6'
* commit 'fa936a307f5cddfc2664600157a8207ca8080af6':
hevc_parse: rename into h2645_parse
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/hevc.c')
| -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 785aa7e604..f012c41926 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2448,7 +2448,7 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int 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; @@ -2714,7 +2714,7 @@ fail: 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; @@ -2866,8 +2866,8 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) /* 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->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); if (ret < 0) { av_log(s->avctx, AV_LOG_ERROR, "Error splitting the input into NAL units.\n"); |