RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'd7bebe4805193783f0b6f292f9127a75709fb7d9' 

* commit 'd7bebe4805193783f0b6f292f9127a75709fb7d9':
  hevc: skip invalid/ignored NALUs when splitting the packet

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-12 22:45:58 +02:00
parent d5fcca83b9 d7bebe4805
commit 760304e4c3
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/hevc.c
View File

@ -2647,13 +2647,7 @@ static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal)
if (ret < 0)
return ret;
ret = hls_nal_unit(s);
if (ret < 0) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid NAL unit %d, skipping.\n",
s->nal_unit_type);
goto fail;
} else if (!ret)
return 0;
hls_nal_unit(s);
switch (s->nal_unit_type) {
case NAL_VPS:
@ -2882,12 +2876,22 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
ret = init_get_bits8(&s->HEVClc->gb, nal->data, nal->size);
if (ret < 0)
goto fail;
hls_nal_unit(s);
ret = hls_nal_unit(s);
if (ret <= 0) {
if (ret < 0) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid NAL unit %d, skipping.\n",
s->nal_unit_type);
}
s->nb_nals--;
goto skip_nal;
}
if (s->nal_unit_type == NAL_EOB_NUT ||
s->nal_unit_type == NAL_EOS_NUT)
s->eos = 1;
skip_nal:
buf += consumed;
length -= consumed;
}