diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-07-10 20:48:50 +0000 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-11-02 04:14:43 +0200 |
commit | 1663d97a112261c10f989b70547545048f9e31c3 (patch) | |
tree | 514d6bccd292d142501400eb417b1f05ab0383ac /mp_core.h | |
parent | 0eb5662a051caab194f26c20f1277b28dc7bca76 (diff) | |
download | mpv-1663d97a112261c10f989b70547545048f9e31c3.tar.bz2 mpv-1663d97a112261c10f989b70547545048f9e31c3.tar.xz |
subs: Change global subtitle numbering scheme
Change numbering so that demuxers can "asynchronously" add subtitles
during playback.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31678 b3059339-0415-0410-9bf9-f77b7e298cf2
Fix calculation of global_sub_size.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31711 b3059339-0415-0410-9bf9-f77b7e298cf2
Update global_sub_pos if we auto-selected a subtitle.
This avoid strange behaviour with subtitle selection in that
case, because the subtitle selection code thinks no subtitle
was displayed while we actually did display one.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31863 b3059339-0415-0410-9bf9-f77b7e298cf2
Move function to avoid a forward declaration.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31864 b3059339-0415-0410-9bf9-f77b7e298cf2
Fix subtitle selection: make selecting -sid 0 work again by replacing the
M_PROPERTY_STEP_UP hack by M_PROPERTY_SET and set the global sub pos also
when we do not yet have a subtitle stream but do know the number of subs
from out-of-band as e.g. for DVD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31882 b3059339-0415-0410-9bf9-f77b7e298cf2
100l, re-add vobsub_get_id_by_index call accidentally removed in
r31678.
Patch by ubitux [ubitux gmail com].
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31985 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp_core.h')
-rw-r--r-- | mp_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -169,7 +169,7 @@ typedef struct MPContext { int global_sub_pos; // this encompasses all subtitle sources int set_of_sub_pos; int set_of_sub_size; - int global_sub_indices[SUB_SOURCES]; + int sub_counts[SUB_SOURCES]; // set_of_ass_tracks[i] contains subtitles from set_of_subtitles[i] // parsed by libass or NULL if format unsupported struct ass_track *set_of_ass_tracks[MAX_SUBTITLE_FILES]; |