Merge master.

[dcpomatic.git] / src / lib / ffmpeg_decoder.cc

diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index a1a6636fb6ed005a12577cffede608c369f94149..1d000b62bc3d210f3fdbbb26e4adea73553d71be 100644 (file)
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -31,7 +31,6 @@
 #include <stdint.h>
 #include <boost/lexical_cast.hpp>
 extern "C" {
-#include <tiffio.h>
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libswscale/swscale.h>
@@ -39,9 +38,6 @@ extern "C" {
 }
 #include <sndfile.h>
 #include "film.h"
-#include "format.h"
-#include "transcoder.h"
-#include "job.h"
 #include "filter.h"
 #include "exceptions.h"
 #include "image.h"
@@ -618,3 +614,10 @@ FFmpegDecoder::next () const
 
        return _next_video;
 }
+
+bool
+FFmpegDecoder::done () const
+{
+       return (!_decode_audio || !_audio_codec_context || audio_done()) && (!_decode_video || video_done());
+}
+