summaryrefslogtreecommitdiffstats
path: root/sub/sd.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-02-13 22:54:15 +0100
committerwm4 <wm4@nowhere>2014-02-13 22:54:47 +0100
commit2a2dfd232707ae05254cd0dcb75aac933e9fcf7d (patch)
tree12e3b4135df00636231ee90734868212f8f5834a /sub/sd.h
parent8009646583d523fc045d10c726a3ee11d9d3d3ff (diff)
downloadmpv-2a2dfd232707ae05254cd0dcb75aac933e9fcf7d.tar.bz2
mpv-2a2dfd232707ae05254cd0dcb75aac933e9fcf7d.tar.xz
sub: handle vobsub-in-mp4
The mplayer decoder (spudec.c) actually handled this. There was explicit code for binary palettes (16 32 bit values), and the subtitle resolution was handled by video resolution coincidentally matching the subtitle resolution. Whoever puts vobsub into mp4 should be punished. Fixes the sample gundam_sample.mp4, closes github issue #547.
Diffstat (limited to 'sub/sd.h')
-rw-r--r--sub/sd.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/sub/sd.h b/sub/sd.h
index 088dc166d8..78b9825ead 100644
--- a/sub/sd.h
+++ b/sub/sd.h
@@ -25,6 +25,9 @@ struct sd {
// the resolution of the VO, nor does it have to be the OSD resolution.
int sub_video_w, sub_video_h;
+ // Resolution hints stored in mp4 files.
+ int sub_stream_w, sub_stream_h;
+
// Make sd_ass use an existing track
struct ass_track *ass_track;