diff options
| author | Marton Balint <cus@passwd.hu> | 2022-06-18 23:13:27 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2022-07-06 23:37:29 +0200 |
| commit | 7acc1241219f3b2810fe496c2cc34d79964c6d8f (patch) | |
| tree | e255c0fcfaef34e9a5e27704462b2a19a76303a9 | |
| parent | dbc3b5a902dc1f7392021b3471ef336999f6693c (diff) | |
| download | ffmpeg-7acc1241219f3b2810fe496c2cc34d79964c6d8f.tar.gz | |
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.
| -rw-r--r-- | libavformat/demux.c | 6 |
1 files changed, 0 insertions, 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; |