generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'

Browse Source 
* commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977':
  h2645_parse: add support for parsing h264

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-04-26 14:07:03 +01:00
parent b5c10c4c92 b667252a41
commit 438ed974b8
4 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/hevc.c
View File

@@ -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");