Bump ffmpeg and try to fix small leak with filters.

diff --git a/cscript b/cscript
index f4db238825407c1dd011a33fe34c4f96b4f3a9d8..773d7cda22c963d3f3ed2d6e8e5ecb688a30096a 100644 (file)
--- 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 53d12419a6872f88a8bdb8b5f58658867620d236..4bf9415234e3d54b844e8881e56a75dd30558492 100644 (file)
--- 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 cd5d198079683f588c2a12c68a1648e4a5136e29..7c006aa58834eaf5eb22f1eb80c61d52b37ea5dd 100644 (file)
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -122,7 +122,8 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> 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 ()