aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-10-02 06:42:20 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-10-02 06:42:20 +0000
commita7a9dd0eb642e5291c0ba672c6f17c870c5921a0 (patch)
tree7e7506e8d58b9eb552ddaaa018ca9a091c41c926
parentc3db0bc61d83598d42a5a7bbc03377360ff81fb9 (diff)
downloadffmpeg-a7a9dd0eb642e5291c0ba672c6f17c870c5921a0.tar.gz
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
-rw-r--r--libavformat/aiff.c4
-rw-r--r--libavformat/au.c2
2 files changed, 0 insertions, 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;