Browse Source

h264: do not return an error when NAL parsing of extradata failed

Fixes AnnexB samples with broken extradata, but proper in-band parameter sets

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
tags/n3.1
Hendrik Leppkes Derek Buitenhuis 9 years ago
parent
commit
d6f92103e0
1 changed files with 2 additions and 1 deletions
  1. +2
    -1
      libavcodec/h264.c

+ 2
- 1
libavcodec/h264.c View File

@@ -1233,7 +1233,8 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR,
"Error splitting the input into NAL units.\n");
return ret;
/* don't consider NAL parsing failure a fatal error when parsing extradata, as the stream may work without it */
return parse_extradata ? buf_size : ret;
}

if (avctx->active_thread_type & FF_THREAD_FRAME)


Loading…
Cancel
Save