Browse Source

Fix double free which happens for playback of .rm files after r16365. See

"rmdec.c: double free" discussion on mailinglist, patch with suggestions
from Reimar Doffinger.

Originally committed as revision 16378 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Ronald S. Bultje 17 years ago
parent
commit
c49a3ec30a
2 changed files with 1 additions and 1 deletions
  1. +1
    -0
      libavformat/rdt.c
  2. +0
    -1
      libavformat/rmdec.c

+ 1
- 0
libavformat/rdt.c View File

@@ -438,6 +438,7 @@ static void
rdt_free_extradata (PayloadContext *rdt)
{
ff_rm_free_rmstream(rdt->rmst[0]);
av_free(rdt->rmst[0]);
if (rdt->rmctx)
av_close_input_stream(rdt->rmctx);
av_freep(&rdt->mlti_data);


+ 0
- 1
libavformat/rmdec.c View File

@@ -83,7 +83,6 @@ void ff_rm_free_rmstream (RMStream *rms)
{
av_free(rms->videobuf);
av_free(rms->audiobuf);
av_free(rms);
}

static int rm_read_audio_stream_info(AVFormatContext *s, ByteIOContext *pb,


Loading…
Cancel
Save