summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-04-16 23:10:28 +0100
committerCarl Hetherington <cth@carlh.net>2015-04-16 23:10:28 +0100
commit769c71b5c3e050ccfc1c13771d24328fbf76a495 (patch)
treef75d5c5c953884395b2e59358e2c7faff5d5ba4b /src/lib/ffmpeg.cc
parent91bd51ff82e99113860570b519459303802bd98f (diff)
Add our own raw_convert that uses SafeStringStream.
Diffstat (limited to 'src/lib/ffmpeg.cc')
-rw-r--r--src/lib/ffmpeg.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc
index c39ad8aab..08349fba4 100644
--- a/src/lib/ffmpeg.cc
+++ b/src/lib/ffmpeg.cc
@@ -22,20 +22,19 @@ extern "C" {
#include <libavformat/avformat.h>
#include <libswscale/swscale.h>
}
-#include <dcp/raw_convert.h>
#include "ffmpeg.h"
#include "ffmpeg_content.h"
#include "ffmpeg_audio_stream.h"
#include "ffmpeg_subtitle_stream.h"
#include "exceptions.h"
#include "util.h"
+#include "raw_convert.h"
#include "i18n.h"
using std::string;
using std::cout;
using boost::shared_ptr;
-using dcp::raw_convert;
boost::mutex FFmpeg::_mutex;