[SCM] libav/experimental: eacdata: fix a memleak, return partial packets and use proper return values.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:05:19 UTC 2013
The following commit has been merged in the experimental branch:
commit 36031c20330d7822ddc984ea8b35d55f6454e014
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date: Sat Mar 27 19:09:46 2010 +0000
eacdata: fix a memleak, return partial packets and use proper return values.
Originally committed as revision 22702 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavformat/eacdata.c b/libavformat/eacdata.c
index 5e2594c..5fa2286 100644
--- a/libavformat/eacdata.c
+++ b/libavformat/eacdata.c
@@ -83,10 +83,11 @@ static int cdata_read_packet(AVFormatContext *s, AVPacket *pkt)
CdataDemuxContext *cdata = s->priv_data;
int packet_size = 76*cdata->channels;
- if (av_get_packet(s->pb, pkt, packet_size) != packet_size)
- return AVERROR(EIO);
+ int ret = av_get_packet(s->pb, pkt, packet_size);
+ if (ret < 0)
+ return ret;
pkt->pts = cdata->audio_pts++;
- return 1;
+ return 0;
}
AVInputFormat ea_cdata_demuxer = {
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list