[FFmpeg-cvslog] r20138 - in trunk/libavformat: aiff.c au.c

[reimar]

Author: reimar
Date: Fri Oct  2 08:42:20 2009
New Revision: 20138

Log:
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.

Modified:
   trunk/libavformat/aiff.c
   trunk/libavformat/au.c

Modified: trunk/libavformat/aiff.c
==============================================================================
--- trunk/libavformat/aiff.c	Fri Oct  2 08:40:50 2009	(r20137)
+++ trunk/libavformat/aiff.c	Fri Oct  2 08:42:20 2009	(r20138)
@@ -422,10 +422,6 @@ static int aiff_read_packet(AVFormatCont
     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)

Modified: trunk/libavformat/au.c
==============================================================================
--- trunk/libavformat/au.c	Fri Oct  2 08:40:50 2009	(r20137)
+++ trunk/libavformat/au.c	Fri Oct  2 08:42:20 2009	(r20138)
@@ -164,8 +164,6 @@ static int au_read_packet(AVFormatContex
 {
     int ret;
 
-    if (url_feof(s->pb))
-        return AVERROR(EIO);
     ret= av_get_packet(s->pb, pkt, MAX_SIZE);
     if (ret < 0)
         return ret;