From a7a9dd0eb642e5291c0ba672c6f17c870c5921a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= Date: Fri, 2 Oct 2009 06:42:20 +0000 Subject: [PATCH] Return special EOF checking for aiff and au demuxers, the check was at the wrong place, causing an empty packet to be read before EOF was detected and the eof detection is already now handled by av_get_packet anyway. Originally committed as revision 20138 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/aiff.c | 4 ---- libavformat/au.c | 2 -- 2 files changed, 6 deletions(-) diff --git a/libavformat/aiff.c b/libavformat/aiff.c index 41721e2fa2..570e05d4e3 100644 --- a/libavformat/aiff.c +++ b/libavformat/aiff.c @@ -422,10 +422,6 @@ static int aiff_read_packet(AVFormatContext *s, AVStream *st = s->streams[0]; int res; - /* End of stream may be reached */ - if (url_feof(s->pb)) - return AVERROR(EIO); - /* Now for that packet */ res = av_get_packet(s->pb, pkt, (MAX_SIZE / st->codec->block_align) * st->codec->block_align); if (res < 0) diff --git a/libavformat/au.c b/libavformat/au.c index 3b8faae272..24bdb62c7c 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -164,8 +164,6 @@ static int au_read_packet(AVFormatContext *s, { int ret; - if (url_feof(s->pb)) - return AVERROR(EIO); ret= av_get_packet(s->pb, pkt, MAX_SIZE); if (ret < 0) return ret;