From b9567ce4b9212c3ed386592d318eea0e639472c0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 1 Jan 2014 17:01:07 +0000 Subject: [PATCH] Bump ffmpeg and try to fix small leak with filters. --- cscript | 2 +- src/lib/ffmpeg.cc | 4 ++-- src/lib/filter_graph.cc | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cscript b/cscript index f4db23882..773d7cda2 100644 --- a/cscript +++ b/cscript @@ -114,7 +114,7 @@ def make_control(version, bits, filename): print >>f,' digital projectors.' def dependencies(target): - return (('ffmpeg-cdist', '0b7ef017aca8b572914518c759db1e234d8fc505'), + return (('ffmpeg-cdist', 'a629ea68a20d990b4e61c16067e91563d8d08f50'), ('libdcp', 'v0.91')) def build(target): diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index 53d12419a..4bf941523 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -62,7 +62,7 @@ FFmpeg::~FFmpeg () } } - avcodec_free_frame (&_frame); + av_frame_free (&_frame); avformat_close_input (&_format_context); } @@ -136,7 +136,7 @@ FFmpeg::setup_general () } } - _frame = avcodec_alloc_frame (); + _frame = av_frame_alloc (); if (_frame == 0) { throw DecodeError (N_("could not allocate frame")); } diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc index cd5d19807..7c006aa58 100644 --- a/src/lib/filter_graph.cc +++ b/src/lib/filter_graph.cc @@ -122,7 +122,8 @@ FilterGraph::FilterGraph (shared_ptr content, libdcp::Size throw DecodeError (N_("could not configure filter graph.")); } - /* XXX: leaking `inputs' / `outputs' ? */ + avfilter_inout_free (&inputs); + avfilter_inout_free (&outputs); } FilterGraph::~FilterGraph () -- 2.30.2