diff options
| author | Jindřich Makovička <makovick@gmail.com> | 2012-09-29 11:16:45 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-02-10 18:01:15 +0100 |
| commit | 6731776795a8f7e60991c6185480043a2b94a7ab (patch) | |
| tree | 981cea83dcece7b1bacdd78522082566e29c91ef /libavformat/utils.c | |
| parent | d4e4234147c93289b669fdebb2b0bf9eaaf45625 (diff) | |
| download | ffmpeg-6731776795a8f7e60991c6185480043a2b94a7ab.tar.gz | |
h264: avoid stuck buffer pointer in decode_nal_units
When decode_nal_units() previously encountered a NAL_END_SEQUENCE,
and there are some junk bytes left in the input buffer, but no start codes,
buf_index gets stuck 3 bytes before the end of the buffer.
This can trigger an infinite loop in the caller code, eg. in
try_decode_trame(), as avcodec_decode_video() then keeps returning zeroes,
with 3 bytes of the input packet still available.
With this change, the remaining bytes are skipped so the whole packet gets
consumed.
CC:libav-stable@libav.org
Signed-off-by: Jindřich Makovička <makovick@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 1a8c6917f68f7378465e18f7615762bfd22704c2)
Conflicts:
libavcodec/h264.c
Diffstat (limited to 'libavformat/utils.c')
0 files changed, 0 insertions, 0 deletions