diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-17 08:29:26 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-17 08:29:26 +0000 |
| commit | eb6179a168105811e7ed7e3ad6a0f7277fb2a503 (patch) | |
| tree | 62987fd6f42beed125a1a28fa9561d7751613d60 /command.c | |
| parent | b6e735fde1d1a947383a4182e14a76efa0f5944f (diff) | |
| download | mpv-eb6179a168105811e7ed7e3ad6a0f7277fb2a503.tar.bz2 mpv-eb6179a168105811e7ed7e3ad6a0f7277fb2a503.tar.xz | |
Merge (trivial) dvdnav and dvdread subtitle selection code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23569 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'command.c')
| -rw-r--r-- | command.c | 13 |
1 files changed, 2 insertions, 11 deletions
@@ -1243,17 +1243,6 @@ static int mp_property_sub(m_option_t * prop, int action, void *arg, dvdsub_id = mpctx->global_sub_pos - mpctx->global_sub_indices[SUB_SOURCE_DEMUX]; if (d_sub) { -#ifdef USE_DVDREAD - if (vo_spudec && mpctx->stream->type == STREAMTYPE_DVD) { - d_sub->id = dvdsub_id; - } -#endif - -#ifdef USE_DVDNAV - if (vo_spudec && mpctx->stream->type == STREAMTYPE_DVDNAV) { - d_sub->id = dvdsub_id; - } -#endif if (mpctx->stream->type != STREAMTYPE_DVD && mpctx->stream->type != STREAMTYPE_DVDNAV) { int i = 0; @@ -1268,6 +1257,8 @@ static int mp_property_sub(m_option_t * prop, int action, void *arg, } } } + else if (vo_spudec) + d_sub->id = dvdsub_id; if (mpctx->demuxer->type == DEMUXER_TYPE_MATROSKA) d_sub->id = demux_mkv_change_subs(mpctx->demuxer, dvdsub_id); if (d_sub->sh && d_sub->id >= 0) { |