summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_decoder.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2012-10-08 15:37:04 +0100
committerCarl Hetherington <cth@carlh.net>2012-10-08 15:37:04 +0100
commit5f02ea34590cd6b796a6eaa55211abf5b36fd329 (patch)
tree2bf00f93ab0a73895f7aab6182df8f95d3373a4d /src/lib/ffmpeg_decoder.h
parenta78f48e77516d64f568cd6ea7c35b7095264b78c (diff)
Hacks.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
-rw-r--r--src/lib/ffmpeg_decoder.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 4e5445f67..9b57b5589 100644
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -76,16 +76,22 @@ private:
void setup_general ();
void setup_video ();
void setup_audio ();
+ void setup_subtitle ();
AVFormatContext* _format_context;
int _video_stream;
int _audio_stream; ///< may be < 0 if there is no audio
+ int _subtitle_stream; ///< may be < 0 if there is no subtitle
AVFrame* _frame;
AVCodecContext* _video_codec_context;
AVCodec* _video_codec;
- AVCodecContext* _audio_codec_context; ///< may be 0 if there is no audio
- AVCodec* _audio_codec; ///< may be 0 if there is no audio
+ AVCodecContext* _audio_codec_context; ///< may be 0 if there is no audio
+ AVCodec* _audio_codec; ///< may be 0 if there is no audio
+ AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
+ AVCodec* _subtitle_codec; ///< may be 0 if there is no subtitle
AVPacket _packet;
+ AVSubtitle _subtitle;
+ bool _have_subtitle;
};