[SCM] libav/experimental: 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.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:52:24 UTC 2013


The following commit has been merged in the experimental branch:
commit a7a9dd0eb642e5291c0ba672c6f17c870c5921a0
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Fri Oct 2 06:42:20 2009 +0000

    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

diff --git a/libavformat/aiff.c b/libavformat/aiff.c
index 41721e2..570e05d 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 3b8faae..24bdb62 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;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list