[SCM] libav/experimental: wc3movie: return partial packets if not all data can be read. This is consistent with other demuxer's behaviour and avoids a memleak. It also returns the error from av_get_packet instead of always AVERROR(EIO).

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit cfb9b3550bd62050a2fe2a900c310495b81e327e
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Sat Apr 11 20:48:56 2009 +0000

    wc3movie: return partial packets if not all data can be read.
    This is consistent with other demuxer's behaviour and avoids a memleak.
    It also returns the error from av_get_packet instead of always AVERROR(EIO).
    
    Originally committed as revision 18446 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c
index 8e5dd38..42f50d4 100644
--- a/libavformat/wc3movie.c
+++ b/libavformat/wc3movie.c
@@ -320,8 +320,6 @@ static int wc3_read_packet(AVFormatContext *s,
             ret= av_get_packet(pb, pkt, size);
             pkt->stream_index = wc3->video_stream_index;
             pkt->pts = wc3->pts;
-            if (ret != size)
-                ret = AVERROR(EIO);
             packet_read = 1;
             break;
 
@@ -349,8 +347,6 @@ static int wc3_read_packet(AVFormatContext *s,
             ret= av_get_packet(pb, pkt, size);
             pkt->stream_index = wc3->audio_stream_index;
             pkt->pts = wc3->pts;
-            if (ret != size)
-                ret = AVERROR(EIO);
 
             /* time to advance pts */
             wc3->pts++;

-- 
Libav/FFmpeg packaging