From 4fbd1901fdabc829cfa7e7d4d0c1272bba87033c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 15 Nov 2012 22:26:16 +0000 Subject: Untested external audio support; AB transcodes still broken. --- src/lib/ffmpeg_decoder.h | 5 +++-- 1 file changed, 3 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 5c6f8ab26..a4a9246f0 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -32,6 +32,8 @@ extern "C" { } #include "util.h" #include "decoder.h" +#include "video_decoder.h" +#include "audio_decoder.h" struct AVFilterGraph; struct AVCodecContext; @@ -49,13 +51,12 @@ class Log; /** @class FFmpegDecoder * @brief A decoder using FFmpeg to decode content. */ -class FFmpegDecoder : public Decoder +class FFmpegDecoder : public VideoDecoder, public AudioDecoder { public: FFmpegDecoder (boost::shared_ptr, boost::shared_ptr, Job *); ~FFmpegDecoder (); - /* Methods to query our input video */ float frames_per_second () const; Size native_size () const; int time_base_numerator () const; -- cgit v1.2.3