X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilter_graph.cc;h=daceeaf2d96924b97fb5af633927e73e04fdd2f7;hb=36e81aebf03d00c716b5e603deb0b5f8f6a99f53;hp=d918f7dc8cf0d1bd163fa65ae880331a6fd3e86c;hpb=422be0eece2bf6ee80db1d3c21553cd82efff789;p=dcpomatic.git

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index d918f7dc8..daceeaf2d 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -26,10 +26,8 @@
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
-#include <locked_sstream.h>
 #include "compose.hpp"
 extern "C" {
-#include <libavfilter/avfiltergraph.h>
 #include <libavfilter/buffersrc.h>
 #include <libavfilter/buffersink.h>
 #include <libavformat/avio.h>
@@ -48,11 +46,7 @@ using boost::shared_ptr;
 using boost::weak_ptr;
 using dcp::Size;
 
-/** Construct a FilterGraph for the settings in a piece of content.
- *  @param content Content.
- *  @param s Size of the images to process.
- *  @param p Pixel format of the images to process.
- */
+/** Construct a FilterGraph for the settings in a piece of content */
 FilterGraph::FilterGraph ()
 	: _graph (0)
 	, _copy (false)
@@ -79,12 +73,12 @@ FilterGraph::setup (vector<Filter const *> filters)
 		throw DecodeError (N_("could not create filter graph."));
 	}
 
-	AVFilter* buffer_src = avfilter_get_by_name (src_name().c_str());
+	AVFilter const * buffer_src = avfilter_get_by_name (src_name().c_str());
 	if (!buffer_src) {
 		throw DecodeError (N_("could not find buffer src filter"));
 	}
 
-	AVFilter* buffer_sink = avfilter_get_by_name (sink_name().c_str());
+	AVFilter const * buffer_sink = avfilter_get_by_name (sink_name().c_str());
 	if (!buffer_sink) {
 		throw DecodeError (N_("Could not create buffer sink filter"));
 	}
@@ -117,8 +111,9 @@ FilterGraph::setup (vector<Filter const *> filters)
 		throw DecodeError (N_("could not set up filter graph."));
 	}
 
-	if (avfilter_graph_config (_graph, 0) < 0) {
-		throw DecodeError (N_("could not configure filter graph."));
+	int e = avfilter_graph_config (_graph, 0);
+	if (e < 0) {
+		throw DecodeError (String::compose (N_("could not configure filter graph (%1)"), e));
 	}
 }