Bump ffmpeg version.

diff --git a/ChangeLog b/ChangeLog
index f676d6b99dea3a4e6163b193d8ffdca43b1c559e..a650dbf20564de92967347eee0a56ce698cfc0ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-05  Carl Hetherington  <cth@carlh.net>
+
+       * Bump ffmpeg version.
+
 2014-09-28  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.73.8 released.

diff --git a/cscript b/cscript
index 126bb244f4b7ae0850b7bf2e7fee55e60040b204..b76617c4d4dbdee7388ea682f169470b02d649df 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', '2001bef5b3a6256eedf1cada4977a3ba8a3732cd'))
 
 def build(target, options):

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 0d72eacdfd2311c2a793065078bf178ff4e86a15..639992d70747a37d1a5d89091c6cdb8bb0c566b4 100644 (file)
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -114,7 +114,7 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
        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."));
        }