diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-09-30 20:37:51 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-09-30 20:38:25 +0100 |
| commit | d4fe6a59e2f253c19d661fa8136bda38e855f55c (patch) | |
| tree | 5ceb7a7b5b0d0eec6b50f18faa94af0d93b798bb | |
| parent | a4d8e5d24beddb719180e75f1047ae317bef85a4 (diff) | |
Bump ffmpeg.
| -rw-r--r-- | cscript | 2 | ||||
| -rw-r--r-- | src/lib/filter_graph.cc | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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<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.")); } |
