diff options
| author | Carl Hetherington <cth@carlh.net> | 2022-04-28 14:00:07 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2022-04-28 14:00:07 +0200 |
| commit | e06941199da90359f41ce80c276752bc0f172d7e (patch) | |
| tree | 7862ad33b1ba1c7c0633d55c0400449d80a475fc /src/lib/ffmpeg_decoder.h | |
| parent | d52426b1e69f8af2f7d33022ed4e173a8c876afc (diff) | |
Handle multiple bitmap subtitles at the same time correctly (#2239).
Previously if there were two images at the same time we would start
them both, then the stop time would be set in the second one but
not the first. This meant that the first one would hang around
forever.
Diffstat (limited to 'src/lib/ffmpeg_decoder.h')
| -rw-r--r-- | src/lib/ffmpeg_decoder.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 663a3c687..ce2476fb0 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -24,6 +24,7 @@ */ +#include "bitmap_text.h" #include "decoder.h" #include "ffmpeg.h" #include "util.h" @@ -72,7 +73,7 @@ private: void decode_and_process_audio_packet (AVPacket* packet); void decode_and_process_subtitle_packet (AVPacket* packet); - void process_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from); + BitmapText process_bitmap_subtitle (AVSubtitleRect const * rect); void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from); void maybe_add_subtitle (); |