Bump ffmpeg.

diff --git a/cscript b/cscript
index 90cbbecfbc6c309cfa3ca145d064bfb106e4cab3..180eca9417e615c43acf1ba6e3647f99ade0f6f9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -156,7 +156,7 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', '7e95caa'),
+    return (('ffmpeg-cdist', '2dffa11'),
             ('libdcp', '1.0'))
 
 def build(target, options):

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index d2427c31faf35957b251320d1d091fce2e54b161..2d8f83aa73da6d8b03c46005b5c45ff3780da6f7 100644 (file)
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -117,7 +117,7 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s,
        inputs->pad_idx = 0;
        inputs->next = 0;
 
-       if (avfilter_graph_parse (graph, filters.c_str(), &inputs, &outputs, 0) < 0) {
+       if (avfilter_graph_parse (graph, filters.c_str(), inputs, outputs, 0) < 0) {
                throw DecodeError (N_("could not set up filter graph."));
        }