[FFmpeg-cvslog] lavf: fix invalid reads in avformat_find_stream_info()

[Anton Khirnov]

ffmpeg | branch: oldabi | Anton Khirnov <anton at khirnov.net> | Thu Jul 14 03:08:53 2011 +0200| [e297459eb694490c25acc65bcf75ee1630bd34b6] | committer: Anton Khirnov

lavf: fix invalid reads in avformat_find_stream_info()

(cherry picked from commit e358f7ee90fec591348ca05dff94ebaf4c1a098b)

Conflicts:

	libavformat/utils.c

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e297459eb694490c25acc65bcf75ee1630bd34b6
---

 libavformat/utils.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 15fed32..d155599 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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
            decompress for QuickTime. */
         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++;
         count++;