From f385ef03e5ea27519a31c0839447735a7fba0602 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 31 May 2013 14:19:50 +0100 Subject: Various stuff; mostly change to decoder scaling and adding subtitle; scaling test. --- src/lib/ffmpeg_decoder.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/ffmpeg_decoder.h') 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. -- cgit v1.2.3