lavf: fix invalid reads in avformat_find_stream_info()
(cherry picked from commit e358f7ee90
)
Conflicts:
libavformat/utils.c
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
@ -2394,7 +2394,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
|||||||
it takes longer and uses more memory. For MPEG-4, we need to
|
it takes longer and uses more memory. For MPEG-4, we need to
|
||||||
decompress for QuickTime. */
|
decompress for QuickTime. */
|
||||||
if (!has_codec_parameters(st->codec) || !has_decode_delay_been_guessed(st))
|
if (!has_codec_parameters(st->codec) || !has_decode_delay_been_guessed(st))
|
||||||
try_decode_frame(st, pkt, (options && i <= orig_nb_streams )? &options[i] : NULL);
|
try_decode_frame(st, pkt, (options && i < orig_nb_streams )? &options[i] : NULL);
|
||||||
|
|
||||||
st->codec_info_nb_frames++;
|
st->codec_info_nb_frames++;
|
||||||
count++;
|
count++;
|
||||||
|
Reference in New Issue
Block a user