[FFmpeg-cvslog] Revert "avformat/demux: Make read_frame_internal() return AVERREOR(EAGAIN) on stuck empty input parser"
Marton Balint
git at videolan.org
Thu Jul 7 00:38:15 EEST 2022
ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sat Jun 18 23:13:27 2022 +0200| [7acc1241219f3b2810fe496c2cc34d79964c6d8f] | committer: Marton Balint
Revert "avformat/demux: Make read_frame_internal() return AVERREOR(EAGAIN) on stuck empty input parser"
Hides the underlying real problem with a demuxer returning 0 sized packets.
This reverts commit 02699490c14e86105104940c009953081f69432c.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7acc1241219f3b2810fe496c2cc34d79964c6d8f
---
libavformat/demux.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/libavformat/demux.c b/libavformat/demux.c
index 57720f4311..1620716716 100644
--- a/libavformat/demux.c
+++ b/libavformat/demux.c
@@ -1235,15 +1235,11 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
FFFormatContext *const si = ffformatcontext(s);
int ret, got_packet = 0;
AVDictionary *metadata = NULL;
- int empty = 0;
while (!got_packet && !si->parse_queue.head) {
AVStream *st;
FFStream *sti;
- if (empty > 1)
- return AVERROR(EAGAIN);
-
/* read next packet */
ret = ff_read_packet(s, pkt);
if (ret < 0) {
@@ -1334,8 +1330,6 @@ static int read_frame_internal(AVFormatContext *s, AVPacket *pkt)
}
got_packet = 1;
} else if (st->discard < AVDISCARD_ALL) {
- if (pkt->size == 0)
- empty ++;
if ((ret = parse_packet(s, pkt, pkt->stream_index, 0)) < 0)
return ret;
st->codecpar->sample_rate = sti->avctx->sample_rate;
More information about the ffmpeg-cvslog
mailing list