diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 23:31:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 23:44:24 +0200 |
| commit | 4690a636324663be660602ea4d1d80ba4fa29763 (patch) | |
| tree | e2e86aeda6938c596a5ac3362b59910787b6cd79 /libavcodec/hevc_refs.c | |
| parent | 4c42c66935a7bdaded8667fa76dc0945ae66e867 (diff) | |
| parent | d82e1adc2019135a2fc45372e0ed0b5ef107cdd0 (diff) | |
| download | ffmpeg-4690a636324663be660602ea4d1d80ba4fa29763.tar.gz | |
Merge commit 'd82e1adc2019135a2fc45372e0ed0b5ef107cdd0'
* commit 'd82e1adc2019135a2fc45372e0ed0b5ef107cdd0':
hevc: move splitting the packet into NALUs into a separate function
Conflicts:
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_parse.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/hevc_refs.c')
| -rw-r--r-- | libavcodec/hevc_refs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c index 147877d32f..0c1dbb2486 100644 --- a/libavcodec/hevc_refs.c +++ b/libavcodec/hevc_refs.c @@ -91,7 +91,7 @@ static HEVCFrame *alloc_frame(HEVCContext *s) if (ret < 0) return NULL; - frame->rpl_buf = av_buffer_allocz(s->nb_nals * sizeof(RefPicListTab)); + frame->rpl_buf = av_buffer_allocz(s->pkt.nb_nals * sizeof(RefPicListTab)); if (!frame->rpl_buf) goto fail; |