diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 14:07:03 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 14:07:03 +0100 |
commit | 438ed974b832634c544facaf6de3a23e9e7d774a (patch) | |
tree | e64ec8adb4d53435a816df57839693a44a7a690d /libavcodec/hevc.c | |
parent | b5c10c4c9274b06a7bd6f6e1f0f4c129aa6e892c (diff) | |
parent | b667252a41fbf5a3f6ea8c67fdbc03db3d748977 (diff) |
Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'
* commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977':
h2645_parse: add support for parsing h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/hevc.c')
-rw-r--r-- | libavcodec/hevc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 27b1640c08..d1aa0b06d0 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -2867,7 +2867,7 @@ 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_h2645_packet_split(&s->pkt, buf, length, s->avctx, s->is_nalff, - s->nal_length_size); + 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"); |