diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-05-13 23:44:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-05-13 23:44:54 +0100 |
| commit | 65274489101d5b5c503ea94d61d7ac5eb1372636 (patch) | |
| tree | 2d11e71e33f78ef3224af436c8c93525b4135cfc /src/lib/ffmpeg_decoder.h | |
| parent | edecc975384bfef50418e3fb77e5c4629207ec08 (diff) | |
| parent | 419c025709132e21ce948c4a6051a323f06ee61d (diff) | |
Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 616fa88dd..6f027ce1c 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -64,6 +64,8 @@ private: void decode_audio_packet (); void decode_subtitle_packet (); + void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period); + void maybe_add_subtitle (); boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size); |