From d4fe6a59e2f253c19d661fa8136bda38e855f55c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 30 Sep 2014 20:37:51 +0100 Subject: Bump ffmpeg. --- cscript | 2 +- src/lib/filter_graph.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cscript b/cscript index 90cbbecfb..180eca941 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', '1.0')) def build(target, options): diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc index d2427c31f..2d8f83aa7 100644 --- a/src/lib/filter_graph.cc +++ b/src/lib/filter_graph.cc @@ -117,7 +117,7 @@ FilterGraph::FilterGraph (shared_ptr 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.")); } -- cgit v1.2.3