Various stuff; mostly change to decoder scaling and adding subtitle; scaling test.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index c37479612..7b8e1b50c 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -37,8 +37,6 @@ extern "C" {
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "film.h"
-#include "ffmpeg_content.h"
 
 struct AVFilterGraph;
 struct AVCodecContext;
@@ -52,6 +50,8 @@ class Job;
 class Options;
 class Image;
 class Log;
+class FFmpegContent;
+class Film;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.