Use AV_ prefixes on some FFmpeg bits.

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

diff --git a/src/lib/filter_graph.cc b/src/lib/filter_graph.cc
index da7b0413397b9b01d7529414a4730f7aff59638c..7af247f669f64f7fb022843f9af994a3a6d5887f 100644 (file)
--- a/src/lib/filter_graph.cc
+++ b/src/lib/filter_graph.cc
@@ -21,6 +21,13 @@
  *  @brief A graph of FFmpeg filters.
  */
 
+#include "filter_graph.h"
+#include "filter.h"
+#include "exceptions.h"
+#include "image.h"
+#include "ffmpeg_content.h"
+#include "safe_stringstream.h"
+#include "compose.hpp"
 extern "C" {
 #include <libavfilter/avfiltergraph.h>
 #include <libavfilter/buffersrc.h>
@@ -28,13 +35,7 @@ extern "C" {
 #include <libavfilter/buffersink.h>
 #include <libavformat/avio.h>
 }
-#include "decoder.h"
-#include "filter_graph.h"
-#include "filter.h"
-#include "exceptions.h"
-#include "image.h"
-#include "ffmpeg_content.h"
-#include "safe_stringstream.h"
+#include <iostream>
 
 #include "i18n.h"
 
@@ -94,9 +95,9 @@ FilterGraph::FilterGraph (shared_ptr<const FFmpegContent> content, dcp::Size s,
        }
 
        AVBufferSinkParams* sink_params = av_buffersink_params_alloc ();
-       PixelFormat* pixel_fmts = new PixelFormat[2];
+       AVPixelFormat* pixel_fmts = new AVPixelFormat[2];
        pixel_fmts[0] = _pixel_format;
-       pixel_fmts[1] = PIX_FMT_NONE;
+       pixel_fmts[1] = AV_PIX_FMT_NONE;
        sink_params->pixel_fmts = pixel_fmts;
 
        if (avfilter_graph_create_filter (&_buffer_sink_context, buffer_sink, N_("out"), 0, sink_params, graph) < 0) {