Browse Source

Merge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'

* commit 'e518cb863edc931888ccca6cad86f73ca7430cef':
  jvdec: Fix memory leak of jv->frames

See: 596814f978
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.2-rc1
Michael Niedermayer 11 years ago
parent
commit
b9f33ad320
1 changed files with 9 additions and 9 deletions
  1. +9
    -9
      libavformat/jvdec.c

+ 9
- 9
libavformat/jvdec.c View File

@@ -59,6 +59,15 @@ static int read_probe(AVProbeData *pd)
return 0; return 0;
} }


static int read_close(AVFormatContext *s)
{
JVDemuxContext *jv = s->priv_data;

av_freep(&jv->frames);

return 0;
}

static int read_header(AVFormatContext *s) static int read_header(AVFormatContext *s)
{ {
JVDemuxContext *jv = s->priv_data; JVDemuxContext *jv = s->priv_data;
@@ -221,15 +230,6 @@ static int read_seek(AVFormatContext *s, int stream_index,
return 0; return 0;
} }


static int read_close(AVFormatContext *s)
{
JVDemuxContext *jv = s->priv_data;

av_freep(&jv->frames);

return 0;
}

AVInputFormat ff_jv_demuxer = { AVInputFormat ff_jv_demuxer = {
.name = "jv", .name = "jv",
.long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV"), .long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV"),


Loading…
Cancel
Save