Rename SafeStringStream -> locked_stringstream. Bump deps for removal of stringstream.

[dcpomatic.git] / src / lib / video_filter_graph.cc

diff --git a/src/lib/video_filter_graph.cc b/src/lib/video_filter_graph.cc
index 306a17a5d84a33d891c3c8be465edf828521d921..3549e0947a22412794a7a91e1725e31ae64bc0b6 100644 (file)
--- a/src/lib/video_filter_graph.cc
+++ b/src/lib/video_filter_graph.cc
@@ -1,19 +1,20 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -83,7 +84,7 @@ VideoFilterGraph::can_process (dcp::Size s, AVPixelFormat p) const
 string
 VideoFilterGraph::src_parameters () const
 {
-       SafeStringStream a;
+       locked_stringstream a;
 
        a << "video_size=" << _size.width << "x" << _size.height << ":"
          << "pix_fmt=" << _pixel_format << ":"
@@ -93,7 +94,7 @@ VideoFilterGraph::src_parameters () const
        return a.str ();
 }
 
-AVBufferSinkParams *
+void *
 VideoFilterGraph::sink_parameters () const
 {
        AVBufferSinkParams* sink_params = av_buffersink_params_alloc ();
@@ -103,3 +104,15 @@ VideoFilterGraph::sink_parameters () const
        sink_params->pixel_fmts = pixel_fmts;
        return sink_params;
 }
+
+string
+VideoFilterGraph::src_name () const
+{
+       return "buffer";
+}
+
+string
+VideoFilterGraph::sink_name () const
+{
+       return "buffersink";
+}