diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-05-29 10:13:39 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-05-29 10:13:39 +0000 |
commit | bce75509294618886bd71c4e3770578a8ba94a06 (patch) | |
tree | 327b73ae95db2b52a0d303eb9b4d6524b30a6586 /mplayer.c | |
parent | 36edf0ef69b4765caffd972d3f492643a9882591 (diff) | |
download | mpv-bce75509294618886bd71c4e3770578a8ba94a06.tar.bz2 mpv-bce75509294618886bd71c4e3770578a8ba94a06.tar.xz |
misc cosmetics: K&R style nits, #include placement, indentation
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31263 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 16 |
1 files changed, 10 insertions, 6 deletions
@@ -61,6 +61,8 @@ #include "m_option.h" #include "m_config.h" #include "m_property.h" +#include "mplayer.h" +#include "access_mpcontext.h" #include "cfg-mplayer-def.h" @@ -83,10 +85,8 @@ #include "codec-cfg.h" #include "edl.h" -#include "mplayer.h" #include "spudec.h" #include "vobsub.h" -#include "access_mpcontext.h" #include "osdep/getch2.h" #include "osdep/timer.h" @@ -1861,7 +1861,8 @@ static float timing_sleep(float time_frame) return time_frame; } -static void select_subtitle(MPContext *mpctx) { +static void select_subtitle(MPContext *mpctx) +{ // find the best sub to use int vobsub_index_id = vobsub_get_index_by_id(vo_vobsub, vobsub_id); mpctx->global_sub_pos = -1; // no subs by default @@ -2349,9 +2350,12 @@ static double update_video(int *blit_frame) #ifdef CONFIG_DVDNAV /// wait, still frame or EOF if (mpctx->stream->type == STREAMTYPE_DVDNAV && in_size < 0) { - if (mp_dvdnav_is_eof(mpctx->stream)) return -1; - if (mpctx->d_video) mpctx->d_video->eof = 0; - if (mpctx->d_audio) mpctx->d_audio->eof = 0; + if (mp_dvdnav_is_eof(mpctx->stream)) + return -1; + if (mpctx->d_video) + mpctx->d_video->eof = 0; + if (mpctx->d_audio) + mpctx->d_audio->eof = 0; mpctx->stream->eof = 0; } else #endif |