diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-10 15:47:06 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-10 15:47:06 +0100 |
| commit | cc4a67b7eb8ecaed076e261960848f70e3e741af (patch) | |
| tree | a41a122341543aee630d6842785d90830298a297 /src/lib/ffmpeg_decoder.h | |
| parent | d382f34db155ddaf4bb61538c18b87c7564e00b2 (diff) | |
Subs successfully exported with thumbs.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 59ec7573d..e92b326b8 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -44,6 +44,7 @@ class FilmState; class Options; class Image; class Log; +class Subtitle; /** @class FFmpegDecoder * @brief A decoder using FFmpeg to decode content. @@ -73,7 +74,6 @@ private: int time_base_denominator () const; int sample_aspect_ratio_numerator () const; int sample_aspect_ratio_denominator () const; - void overlay (boost::shared_ptr<Image> image) const; void setup_general (); void setup_video (); @@ -96,6 +96,5 @@ private: AVCodec* _subtitle_codec; ///< may be 0 if there is no subtitle AVPacket _packet; - AVSubtitle _subtitle; - bool _have_subtitle; + boost::shared_ptr<Subtitle> _subtitle; }; |
