Merge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'

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

See: 596814f978
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-20 23:56:43 +01:00
commit b9f33ad320

View File

@ -59,6 +59,15 @@ static int read_probe(AVProbeData *pd)
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)
{
JVDemuxContext *jv = s->priv_data;
@ -221,15 +230,6 @@ static int read_seek(AVFormatContext *s, int stream_index,
return 0;
}
static int read_close(AVFormatContext *s)
{
JVDemuxContext *jv = s->priv_data;
av_freep(&jv->frames);
return 0;
}
AVInputFormat ff_jv_demuxer = {
.name = "jv",
.long_name = NULL_IF_CONFIG_SMALL("Bitmap Brothers JV"),