summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-08-18 18:04:49 +0100
committerCarl Hetherington <cth@carlh.net>2015-08-18 18:04:49 +0100
commitc2a97b6f83a32483817d02194a1e7c8d6828b0bb (patch)
tree538dc2cf638cd6dd184a4904a950e69082a55e5b /src/lib/ffmpeg_decoder.cc
parent99856300c7080f7602507ae6f64b870200710736 (diff)
Include tidying.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
-rw-r--r--src/lib/ffmpeg_decoder.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index 0c9225a6a..a17419dc7 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -34,18 +34,16 @@
#include "ffmpeg_content.h"
#include "raw_image_proxy.h"
#include "film.h"
-#include "timer.h"
+#include "compose.hpp"
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
}
#include <boost/foreach.hpp>
-#include <stdexcept>
#include <vector>
#include <iomanip>
#include <iostream>
#include <stdint.h>
-#include <sndfile.h>
#include "i18n.h"
@@ -55,16 +53,12 @@ extern "C" {
#define LOG_WARNING(...) _video_content->film()->log()->log (String::compose (__VA_ARGS__), Log::TYPE_WARNING);
using std::cout;
-using std::string;
using std::vector;
using std::list;
using std::min;
using std::pair;
-using std::make_pair;
using std::max;
using boost::shared_ptr;
-using boost::optional;
-using boost::dynamic_pointer_cast;
using dcp::Size;
FFmpegDecoder::FFmpegDecoder (shared_ptr<const FFmpegContent> c, shared_ptr<Log> log)
@@ -535,4 +529,3 @@ FFmpegDecoder::decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimeP
image_subtitle (period, image, scaled_rect);
}
-