X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=990d643a704d6ab5223cdb2bebc9467d736f18e6;hb=b048889b399367bf0fc8b905c7c0cf436d629f57;hp=1429c306b7429acb379a63c94b861321a5d59b73;hpb=b147c77c6d44399ad522298ac52a481fe5988287;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 1429c306b..990d643a7 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -61,9 +61,10 @@ private: void decode_subtitle_packet (); void decode_bitmap_subtitle (AVSubtitleRect const * rect, ContentTimePeriod period); + void decode_ass_subtitle (std::string ass, ContentTimePeriod period); void maybe_add_subtitle (); - boost::shared_ptr deinterleave_audio (boost::shared_ptr stream, uint8_t** data, int size); + boost::shared_ptr deinterleave_audio (boost::shared_ptr stream) const; std::list image_subtitles_during (ContentTimePeriod, bool starting) const; std::list text_subtitles_during (ContentTimePeriod, bool starting) const;