Merge master.

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

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index 48d94e17570c2c6306ba975574c42a1e66f64e7f..8b259a12d01e26c1b126c9d1296ac2632c3ee10d 100644 (file)
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -60,7 +60,7 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s,
 {
        _frame = av_frame_alloc ();
        
-       string filters = Filter::ffmpeg_strings (content->filters()).first;
+       string filters = Filter::ffmpeg_string (content->filters());
        if (filters.empty ()) {
                filters = "copy";
        }
@@ -143,7 +143,7 @@ FilterGraph::process (AVFrame* frame)
                throw DecodeError (N_("could not push buffer into filter chain."));
        }
 
-       while (1) {
+       while (true) {
                if (av_buffersink_get_frame (_buffer_sink_context, _frame) < 0) {
                        break;
                }