Mercurial > mplayer.hg

comparison mplayer.c @ 17286:b0046966ab82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't reset dvdsub->id unless -slang is specified; assign default sub stream id when demux->sub->id is -1 (autodetect)
author nicodvb
date Mon, 02 Jan 2006 20:40:25 +0000
parents 13b99f89969f
children 25fdd83982a4
comparison
equal deleted inserted replaced
17285:993b6c4fa604 17286:b0046966ab82
3792 set_of_sub_pos = -1; 3792 set_of_sub_pos = -1;
3793 subdata = NULL; 3793 subdata = NULL;
3794 vo_sub_last = vo_sub = NULL; 3794 vo_sub_last = vo_sub = NULL;
3795 #endif 3795 #endif
3796 vobsub_id = -1; 3796 vobsub_id = -1;
3797 if(dvdsub_lang) {
3797 dvdsub_id = -1; 3798 dvdsub_id = -1;
3798 if (d_dvdsub) d_dvdsub->id = -1; 3799 if (d_dvdsub) d_dvdsub->id = -1;
3800 }
3799 3801
3800 // be careful! 3802 // be careful!
3801 // if sub_changed is till on but subdata's been reset, bad things happen. 3803 // if sub_changed is till on but subdata's been reset, bad things happen.
3802 osd_show_vobsub_changed = 0; 3804 osd_show_vobsub_changed = 0;
3803 osd_show_sub_changed = 0; 3805 osd_show_sub_changed = 0;