summaryrefslogtreecommitdiffstats
path: root/sub/sd.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-12-05 23:56:28 +0100
committerwm4 <wm4@nowhere>2015-12-05 23:56:28 +0100
commit94c062d0d2a7369ffbde17a330aeb05973e44ab9 (patch)
tree9eb08087b11d8ce8df5c1d985a768184297814c6 /sub/sd.h
parent04934e86dd154d1824253ba468c8f76eadc3076a (diff)
downloadmpv-94c062d0d2a7369ffbde17a330aeb05973e44ab9.tar.bz2
mpv-94c062d0d2a7369ffbde17a330aeb05973e44ab9.tar.xz
sub: move subtitle FPS adjustment to sd_ass.c
I feel like it's better there. Note that there is no reduced functionality, as bitmaps subs (i.e. not handled by sd_ass.c) were never fully read on init, and thus never went through sub_read_all_packets(). On the other hand, this might lead to confusion, as --sub-fps etc. will now also affect muxed subtitles (which makes not much sense).
Diffstat (limited to 'sub/sd.h')
-rw-r--r--sub/sd.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/sub/sd.h b/sub/sd.h
index 9e6b1eb0ec..cae3e156ee 100644
--- a/sub/sd.h
+++ b/sub/sd.h
@@ -22,6 +22,8 @@ struct sd {
char *extradata;
int extradata_len;
+ struct sh_stream *sh;
+
// Set to !=NULL if the input packets are being converted from another
// format.
const char *converted_from;
@@ -30,6 +32,8 @@ struct sd {
// the resolution of the VO, nor does it have to be the OSD resolution.
int sub_video_w, sub_video_h;
+ double video_fps;
+
// Shared renderer for ASS - done to avoid reloading embedded fonts.
struct ass_library *ass_library;
struct ass_renderer *ass_renderer;