OSDN Git Service

h264: avoid stuck buffer pointer in decode_nal_units
authorJindřich Makovička <makovick@gmail.com>
Sat, 29 Sep 2012 09:16:45 +0000 (11:16 +0200)
committerAnton Khirnov <anton@khirnov.net>
Sat, 29 Sep 2012 17:31:17 +0000 (19:31 +0200)
commit1a8c6917f68f7378465e18f7615762bfd22704c2
tree95fefb1dcfc3c6b00157121c612e07d246e96fd2
parent0f583d20d5ddcab34d8af76a597d5d6f1f19fece
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>
libavcodec/h264.c