summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.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_content.cc
parentb1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f (diff)
Move raw_convert into libdcp.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
-rw-r--r--src/lib/ffmpeg_content.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 9f8cb78a6..d64c82971 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -32,8 +32,8 @@
#include "log.h"
#include "exceptions.h"
#include "frame_rate_change.h"
-#include "raw_convert.h"
#include "subtitle_content.h"
+#include <dcp/raw_convert.h>
#include <libcxml/cxml.h>
extern "C" {
#include <libavformat/avformat.h>
@@ -57,6 +57,7 @@ using std::max;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+using dcp::raw_convert;
int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
int const FFmpegContentProperty::SUBTITLE_STREAM = 101;