[FFmpeg-cvslog] Revert "avformat/demux: Count EAGAIN as 100 bytes in relation to read limit in avformat_find_stream_info()"

Marton Balint git at videolan.org
Thu Jul 7 00:38:13 EEST 2022


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sat Jun 18 23:13:16 2022 +0200| [dbc3b5a902dc1f7392021b3471ef336999f6693c] | committer: Marton Balint

Revert "avformat/demux: Count EAGAIN as 100 bytes in relation to read limit in avformat_find_stream_info()"

Modifying avformat_find_stream_info() behaviour based on the number of EAGAINs
it encounters is a hack which usually only hides the real issue if such thing
happen.

This reverts commit b0cac7082d8a3ff2d4f039af01b45c48bb578de7.

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

 libavformat/demux.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libavformat/demux.c b/libavformat/demux.c
index e121253dfd..57720f4311 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -2615,10 +2615,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
         /* NOTE: A new stream can be added there if no header in file
          * (AVFMTCTX_NOHEADER). */
         ret = read_frame_internal(ic, pkt1);
-        if (ret == AVERROR(EAGAIN)) {
-            read_size += 100;
+        if (ret == AVERROR(EAGAIN))
             continue;
-        }
 
         if (ret < 0) {
             /* EOF or error*/



More information about the ffmpeg-cvslog mailing list