diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-16 03:29:55 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-16 03:29:55 +0100 |
| commit | 068bb5b95652c022419c64f3d29cc42c4610ae93 (patch) | |
| tree | 373b5b9bd91a351ae9727e6d4f388eb7157fda7f /src/lib/decoder.h | |
| parent | 13511ed2fcc23f4d5f9c507c775c3c5cfd82d155 (diff) | |
| parent | 27e1f73c75e6c0f75d4863cfe2c8e50f811913d9 (diff) | |
Merge branch 'master' of /home/carl/git/dvdomatic
Diffstat (limited to 'src/lib/decoder.h')
| -rw-r--r-- | src/lib/decoder.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/decoder.h b/src/lib/decoder.h index 805955b9d..8a04ec9f2 100644 --- a/src/lib/decoder.h +++ b/src/lib/decoder.h @@ -37,6 +37,7 @@ class Options; class Image; class Log; class DelayLine; +class TimedSubtitle; class Subtitle; /** @class Decoder. @@ -103,7 +104,7 @@ protected: void process_video (AVFrame *); void process_audio (uint8_t *, int); - void process_subtitle (boost::shared_ptr<Subtitle>); + void process_subtitle (boost::shared_ptr<TimedSubtitle>); /** our FilmState */ boost::shared_ptr<const FilmState> _fs; @@ -140,7 +141,7 @@ private: */ int64_t _audio_frames_processed; - boost::shared_ptr<Subtitle> _subtitle; + boost::shared_ptr<TimedSubtitle> _timed_subtitle; }; #endif |