summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-07 23:11:40 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-07 23:11:40 +0000
commit1057181fd7ef1684ddaefbb081b9e90cb6eee348 (patch)
tree0709301a7b5f7f5a03c39bcabd5e3b6f5de867a2
parentb5b701c544338af167932a0cd803e3a11d1ab0d7 (diff)
downloadmpv-1057181fd7ef1684ddaefbb081b9e90cb6eee348.tar.bz2
mpv-1057181fd7ef1684ddaefbb081b9e90cb6eee348.tar.xz
Add braces to avoid ambiguous else.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29979 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--mplayer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index e7efa93ac9..37f176dc83 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -2445,11 +2445,12 @@ static void pause_loop(void)
mp_cmd_free(cmd);
}
mpctx->osd_function=OSD_PLAY;
- if (mpctx->audio_out && mpctx->sh_audio)
+ if (mpctx->audio_out && mpctx->sh_audio) {
if (mpctx->eof) // do not play remaining audio if we e.g. switch to the next file
mpctx->audio_out->reset();
else
mpctx->audio_out->resume(); // resume audio
+ }
if (mpctx->video_out && mpctx->sh_video && vo_config_count)
mpctx->video_out->control(VOCTRL_RESUME, NULL); // resume video
(void)GetRelativeTime(); // ignore time that passed during pause