Mercurial > mplayer.hg

comparison command.c @ 25962:afa125da85cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
typo fix: inited --> initialized
author diego
date Thu, 14 Feb 2008 14:23:55 +0000
parents 36bc17c090a6
children 19fa7a56ed04
comparison
equal deleted inserted replaced
25961:354ad909efcf 25962:afa125da85cf
841 current_id = mpctx->demuxer->audio->id; 841 current_id = mpctx->demuxer->audio->id;
842 audio_id = demuxer_switch_audio(mpctx->demuxer, tmp); 842 audio_id = demuxer_switch_audio(mpctx->demuxer, tmp);
843 if (audio_id == -2 843 if (audio_id == -2
844 || (audio_id > -1 844 || (audio_id > -1
845 && mpctx->demuxer->audio->id != current_id && current_id != -2)) 845 && mpctx->demuxer->audio->id != current_id && current_id != -2))
846 uninit_player(INITED_AO | INITED_ACODEC); 846 uninit_player(INITIALIZED_AO | INITIALIZED_ACODEC);
847 if (audio_id > -1 && mpctx->demuxer->audio->id != current_id) { 847 if (audio_id > -1 && mpctx->demuxer->audio->id != current_id) {
848 sh_audio_t *sh2; 848 sh_audio_t *sh2;
849 sh2 = mpctx->demuxer->a_streams[mpctx->demuxer->audio->id]; 849 sh2 = mpctx->demuxer->a_streams[mpctx->demuxer->audio->id];
850 if (sh2) { 850 if (sh2) {
851 sh2->ds = mpctx->demuxer->audio; 851 sh2->ds = mpctx->demuxer->audio;
899 tmp = -1; 899 tmp = -1;
900 video_id = demuxer_switch_video(mpctx->demuxer, tmp); 900 video_id = demuxer_switch_video(mpctx->demuxer, tmp);
901 if (video_id == -2 901 if (video_id == -2
902 || (video_id > -1 && mpctx->demuxer->video->id != current_id 902 || (video_id > -1 && mpctx->demuxer->video->id != current_id
903 && current_id != -2)) 903 && current_id != -2))
904 uninit_player(INITED_VCODEC | 904 uninit_player(INITIALIZED_VCODEC |
905 (fixed_vo && video_id != -2 ? 0 : INITED_VO)); 905 (fixed_vo && video_id != -2 ? 0 : INITIALIZED_VO));
906 if (video_id > -1 && mpctx->demuxer->video->id != current_id) { 906 if (video_id > -1 && mpctx->demuxer->video->id != current_id) {
907 sh_video_t *sh2; 907 sh_video_t *sh2;
908 sh2 = mpctx->demuxer->v_streams[mpctx->demuxer->video->id]; 908 sh2 = mpctx->demuxer->v_streams[mpctx->demuxer->video->id];
909 if (sh2) { 909 if (sh2) {
910 sh2->ds = mpctx->demuxer->video; 910 sh2->ds = mpctx->demuxer->video;