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>
This commit is contained in:
Hendrik Leppkes 2016-05-07 13:28:31 +02:00 committed by Derek Buitenhuis
parent 772ad7142d
commit d6f92103e0
1 changed files with 2 additions and 1 deletions

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)