Message ID | 20220627200241.7102-1-cus@passwd.hu |
---|---|
State | Accepted |
Commit | dbc3b5a902dc1f7392021b3471ef336999f6693c |
Headers | show |
Series | [FFmpeg-devel,1/3] Revert "avformat/demux: Count EAGAIN as 100 bytes in relation to read limit in avformat_find_stream_info()" | expand |
Context | Check | Description |
---|---|---|
yinshiyou/commit_msg_loongarch64 | warning | Please wrap lines in the body of the commit message between 60 and 72 characters. |
yinshiyou/make_loongarch64 | success | Make finished |
yinshiyou/make_fate_loongarch64 | success | Make fate finished |
andriy/commit_msg_x86 | warning | Please wrap lines in the body of the commit message between 60 and 72 characters. |
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
Quoting Marton Balint (2022-06-27 22:02:39) > 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. > --- > libavformat/demux.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) very much ok
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*/