summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-10-05 23:18:39 +0100
committerCarl Hetherington <cth@carlh.net>2014-10-05 23:18:39 +0100
commit1ac89aeb6ca8642b7cc0f6b43899e4c8d9e08489 (patch)
treea62ff054492a9a1d795d69f2082d4abd18e4f661
parent97ad6afa48bd6324132a25103ac2d36df5d4829c (diff)
Bump ffmpeg version.
-rw-r--r--ChangeLog4
-rw-r--r--cscript2
-rw-r--r--src/lib/filter_graph.cc2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f676d6b99..a650dbf20 100644
--- 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 126bb244f..b76617c4d 100644
--- 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 0d72eacdf..639992d70 100644
--- 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."));
}