[SCM] libav/experimental: dont ignore MAX_READ_SIZE
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:51:04 UTC 2013
The following commit has been merged in the experimental branch:
commit 5fb83c384480c76bb4b05248c09f9c4bc77ce4f4
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Sep 26 17:25:28 2006 +0000
dont ignore MAX_READ_SIZE
Originally committed as revision 6341 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 425db9a..910aaca 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1811,13 +1811,12 @@ int av_find_stream_info(AVFormatContext *ic)
ret = count;
break;
}
- } else {
+ }
/* we did not get all the codec info, but we read too much data */
if (read_size >= MAX_READ_SIZE) {
ret = count;
break;
}
- }
/* NOTE: a new stream can be added there if no header in file
(AVFMTCTX_NOHEADER) */
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list