generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent memory leak introduced in r22389 in Bink demuxer: pass partial packets to decoder.

Browse Source 
Originally committed as revision 22468 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Peter Ross
2010-03-11 12:29:02 +00:00
parent 2b3da32f74
commit 70b462cc29
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/bink.c
View File

@@ -212,15 +212,16 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
bink->current_track++; bink->current_track++;
if (audio_size >= 4) { if (audio_size >= 4) {
/* get one audio packet per track */ /* get one audio packet per track */
if ((ret = av_get_packet(pb, pkt, audio_size)) != audio_size) if ((ret = av_get_packet(pb, pkt, audio_size)) < 0)
return ret < 0 ? ret : AVERROR(EIO);; return ret;
pkt->stream_index = bink->current_track; pkt->stream_index = bink->current_track;
pkt->pts = bink->audio_pts[bink->current_track - 1]; pkt->pts = bink->audio_pts[bink->current_track - 1];
/* Each audio packet reports the number of decompressed samples /* Each audio packet reports the number of decompressed samples
(in bytes). We use this value to calcuate the audio PTS */ (in bytes). We use this value to calcuate the audio PTS */
bink->audio_pts[bink->current_track -1] += if (pkt->size >= 4)
AV_RL32(pkt->data) / (2 * s->streams[bink->current_track]->codec->channels); bink->audio_pts[bink->current_track -1] +=
AV_RL32(pkt->data) / (2 * s->streams[bink->current_track]->codec->channels);
return 0; return 0;
} else { } else {
url_fseek(pb, audio_size, SEEK_CUR); url_fseek(pb, audio_size, SEEK_CUR);
@@ -228,9 +229,8 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
} }
/* get video packet */ /* get video packet */
if ((ret = av_get_packet(pb, pkt, bink->remain_packet_size)) if ((ret = av_get_packet(pb, pkt, bink->remain_packet_size)) < 0)
!= bink->remain_packet_size) return ret;
return ret < 0 ? ret : AVERROR(EIO);
pkt->stream_index = 0; pkt->stream_index = 0;
pkt->pts = bink->video_pts++; pkt->pts = bink->video_pts++;
pkt->flags |= PKT_FLAG_KEY; pkt->flags |= PKT_FLAG_KEY;