diff options
author | wm4 <wm4@nowhere> | 2013-04-29 01:19:56 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-30 22:40:32 +0200 |
commit | f429b4eaa89d9d752b2701582ebc287265f20450 (patch) | |
tree | ac3d161cfb742b583316a4e72db5c390257132c4 /sub | |
parent | 26842806431a1d21e3c3c430994cd6901e36a08e (diff) | |
download | mpv-f429b4eaa89d9d752b2701582ebc287265f20450.tar.bz2 mpv-f429b4eaa89d9d752b2701582ebc287265f20450.tar.xz |
spudec: restore --sub-forced-only support
This was broken with 84829a4 "Merge branch 'osd_changes' into master".
The new OSD/subtitle code never respected the --sub-forced-only option,
and the old code containing the code for this was removed in fd5c4a1.
Diffstat (limited to 'sub')
-rw-r--r-- | sub/spudec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sub/spudec.c b/sub/spudec.c index 87cd46bdd7..07dbb3af07 100644 --- a/sub/spudec.c +++ b/sub/spudec.c @@ -629,6 +629,8 @@ int spudec_visible(void *this){ spu->now_pts < spu->end_pts && spu->height > 0); // printf("spu visible: %d \n",ret); + if ((spu->forced_subs_only) && !(spu->is_forced_sub)) + ret = 0; return ret; } |