diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-18 20:41:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-18 23:36:18 +0200 |
commit | cc13bc8c4f0f4afa30d0b94c3f3a369ccd2aaf0b (patch) | |
tree | cc951b2cf772d43ea307d0fb7bced2a8325a1763 /libavcodec/h264dec.c | |
parent | e2a39b103e5917780744fed6fd4336cf65a220f4 (diff) | |
download | ffmpeg-cc13bc8c4f0f4afa30d0b94c3f3a369ccd2aaf0b.tar.gz |
avcodec/h2645: Fix NAL unit padding
The parser changes have lost the support for the needed padding, this adds it back
Fixes out of array reads
Fixes: 03ea21d271abc8acf428d42ace51d8b4/asan_heap-oob_3358eef_5692_16f0cc01ab5225e9ce591659e5c20e35.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/h264dec.c')
-rw-r--r-- | libavcodec/h264dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 904ae558d6..9c37d460d4 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -748,7 +748,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size) } ret = ff_h2645_packet_split(&h->pkt, buf, buf_size, avctx, h->is_avc, - h->nal_length_size, avctx->codec_id); + h->nal_length_size, avctx->codec_id, avctx->flags2 & AV_CODEC_FLAG2_FAST); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error splitting the input into NAL units.\n"); |