summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-08-11 11:07:18 +0100
committerCarl Hetherington <cth@carlh.net>2016-08-12 09:14:05 +0100
commit73654117144c6de0ec4efe39ddc88485df546cc9 (patch)
tree4402a65c2988ba6e678c4cf51f6e2d48cad424e5 /src/lib/ffmpeg.cc
parentb1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f (diff)
Move raw_convert into libdcp.
Diffstat (limited to 'src/lib/ffmpeg.cc')
-rw-r--r--src/lib/ffmpeg.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index bbf9bbed9..1f16514d7 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -23,12 +23,12 @@
#include "film.h"
#include "exceptions.h"
#include "util.h"
-#include "raw_convert.h"
#include "log.h"
#include "ffmpeg_subtitle_stream.h"
#include "ffmpeg_audio_stream.h"
#include "digester.h"
#include "compose.hpp"
+#include <dcp/raw_convert.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@ -46,6 +46,7 @@ using std::cerr;
using std::vector;
using boost::shared_ptr;
using boost::optional;
+using dcp::raw_convert;
boost::mutex FFmpeg::_mutex;
boost::weak_ptr<Log> FFmpeg::_ffmpeg_log;