Commit a7a9dd0e authored by Reimar Döffinger's avatar Reimar Döffinger

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
parent c3db0bc6
...@@ -422,10 +422,6 @@ static int aiff_read_packet(AVFormatContext *s, ...@@ -422,10 +422,6 @@ static int aiff_read_packet(AVFormatContext *s,
AVStream *st = s->streams[0]; AVStream *st = s->streams[0];
int res; int res;
/* End of stream may be reached */
if (url_feof(s->pb))
return AVERROR(EIO);
/* Now for that packet */ /* Now for that packet */
res = av_get_packet(s->pb, pkt, (MAX_SIZE / st->codec->block_align) * st->codec->block_align); res = av_get_packet(s->pb, pkt, (MAX_SIZE / st->codec->block_align) * st->codec->block_align);
if (res < 0) if (res < 0)
......
...@@ -164,8 +164,6 @@ static int au_read_packet(AVFormatContext *s, ...@@ -164,8 +164,6 @@ static int au_read_packet(AVFormatContext *s,
{ {
int ret; int ret;
if (url_feof(s->pb))
return AVERROR(EIO);
ret= av_get_packet(s->pb, pkt, MAX_SIZE); ret= av_get_packet(s->pb, pkt, MAX_SIZE);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment