X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Ffilter_graph.cc;h=5add16d19bcedac612b55eecf5bc85a7feedf99a;hp=7c006aa58834eaf5eb22f1eb80c61d52b37ea5dd;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hpb=8353a009aae1a604251c0160193c39741c2fa27c

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 7c006aa58..5add16d19 100644
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -45,14 +45,14 @@ using std::make_pair;
 using std::cout;
 using boost::shared_ptr;
 using boost::weak_ptr;
-using libdcp::Size;
+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.
  */
-FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size s, AVPixelFormat p)
+FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s, AVPixelFormat p)
 	: _buffer_src_context (0)
 	, _buffer_sink_context (0)
 	, _size (s)
@@ -60,7 +60,7 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, libdcp::Size
 {
 	_frame = av_frame_alloc ();
 	
-	string filters = Filter::ffmpeg_strings (content->filters()).first;
+	string filters = Filter::ffmpeg_string (content->filters());
 	if (filters.empty ()) {
 		filters = "copy";
 	}
@@ -160,7 +160,7 @@ FilterGraph::process (AVFrame* frame)
  *  @return true if this chain can process images with `s' and `p', otherwise false.
  */
 bool
-FilterGraph::can_process (libdcp::Size s, AVPixelFormat p) const
+FilterGraph::can_process (dcp::Size s, AVPixelFormat p) const
 {
 	return (_size == s && _pixel_format == p);
 }