diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-20 23:56:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-20 23:59:05 +0100 |
| commit | b9f33ad32077eb0570a9038a9ff93a176ef66dfe (patch) | |
| tree | c4bed604ac3ff8ebb8cb2e42976e106aee24c70a | |
| parent | d2344afb90db38c8e0367b05540f21c4fb2e91a1 (diff) | |
| parent | e518cb863edc931888ccca6cad86f73ca7430cef (diff) | |
| download | ffmpeg-b9f33ad32077eb0570a9038a9ff93a176ef66dfe.tar.gz | |
Merge commit 'e518cb863edc931888ccca6cad86f73ca7430cef'
* commit 'e518cb863edc931888ccca6cad86f73ca7430cef':
jvdec: Fix memory leak of jv->frames
See: 596814f9781772050c65bdd8add27445bc8374a4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/jvdec.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/jvdec.c b/libavformat/jvdec.c index 60c1bd9222..548223116f 100644 --- a/libavformat/jvdec.c +++ b/libavformat/jvdec.c @@ -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"), |