projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fill test disk partitions with random noise to expose more bugs.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_decoder.h
diff --git
a/src/lib/ffmpeg_decoder.h
b/src/lib/ffmpeg_decoder.h
index 663a3c6870cbf2006c70946518e141285f506e29..ce2476fb03b5bf6e1903ffe0de43c6cc33394b8e 100644
(file)
--- 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"
#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 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 ();
void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
void maybe_add_subtitle ();