Mercurial > mplayer.hg
comparison mplayer.c @ 26721:ea0f7d488ed9
Cosmetics: remove some commented code.
author | eugeni |
---|---|
date | Mon, 12 May 2008 20:40:42 +0000 |
parents | d68c3cd43cd4 |
children | a42c300ec8bf |
comparison
equal
deleted
inserted
replaced
26720:d68c3cd43cd4 | 26721:ea0f7d488ed9 |
---|---|
3480 dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang); | 3480 dvdsub_id = demuxer_sub_track_by_lang(mpctx->demuxer, dvdsub_lang); |
3481 if (dvdsub_id < 0) | 3481 if (dvdsub_id < 0) |
3482 dvdsub_id = demuxer_default_sub_track(mpctx->demuxer); | 3482 dvdsub_id = demuxer_default_sub_track(mpctx->demuxer); |
3483 if (dvdsub_id >= 0) | 3483 if (dvdsub_id >= 0) |
3484 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id; | 3484 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX] + dvdsub_id; |
3485 /* | |
3486 } else if (mpctx->global_sub_indices[SUB_SOURCE_DEMUX] >= 0) { | |
3487 // if nothing else works, get subs from the demuxer. | |
3488 mpctx->global_sub_pos = mpctx->global_sub_indices[SUB_SOURCE_DEMUX]; | |
3489 */ | |
3490 } | 3485 } |
3491 // rather than duplicate code, use the SUB_SELECT handler to init the right one. | 3486 // rather than duplicate code, use the SUB_SELECT handler to init the right one. |
3492 mpctx->global_sub_pos--; | 3487 mpctx->global_sub_pos--; |
3493 mp_property_do("sub",M_PROPERTY_STEP_UP,NULL, mpctx); | 3488 mp_property_do("sub",M_PROPERTY_STEP_UP,NULL, mpctx); |
3494 if(subdata) | 3489 if(subdata) |