diff options
| author | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-12 23:24:01 +0100 |
|---|---|---|
| committer | Stefano Pigozzi <stefano.pigozzi@gmail.com> | 2012-11-13 22:19:18 +0100 |
| commit | bec630c34753f7fbbac8712661b596ff5a76b7c1 (patch) | |
| tree | 633035ee2654d301ed9a13dd83f006b7cab173b5 /core | |
| parent | 9203f06cf32a260f0ed4209eb744c58e0e6db47b (diff) | |
| download | mpv-bec630c34753f7fbbac8712661b596ff5a76b7c1.tar.bz2 mpv-bec630c34753f7fbbac8712661b596ff5a76b7c1.tar.xz | |
clang: fix all warnings except deprecations
Diffstat (limited to 'core')
| -rw-r--r-- | core/mplayer.c | 4 | ||||
| -rw-r--r-- | core/timeline/tl_edl.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/core/mplayer.c b/core/mplayer.c index 1a9fe04f4c..fd260c3a2a 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -1079,7 +1079,7 @@ static void print_status(struct MPContext *mpctx, double a_pos, bool at_frame) mpctx->last_av_difference = MP_NOPTS_VALUE; if (mpctx->last_av_difference > 0.5 && drop_frame_cnt > 50 && !mpctx->drop_message_shown) { - mp_tmsg(MSGT_AVSYNC, MSGL_WARN, mp_gtext(av_desync_help_text)); + mp_tmsg(MSGT_AVSYNC, MSGL_WARN, "%s", mp_gtext(av_desync_help_text)); mpctx->drop_message_shown = true; } } @@ -3771,7 +3771,9 @@ static void play_current_file(struct MPContext *mpctx) mpctx->stream->start_pos += seek_to_byte; // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts) +#ifdef CONFIG_DVBIN goto_enable_cache: +#endif if (opts->stream_cache_size > 0) { int res = stream_enable_cache_percent(mpctx->stream, opts->stream_cache_size, diff --git a/core/timeline/tl_edl.c b/core/timeline/tl_edl.c index 1af36a54f8..fb8441d322 100644 --- a/core/timeline/tl_edl.c +++ b/core/timeline/tl_edl.c @@ -322,11 +322,12 @@ void build_edl_timeline(struct MPContext *mpctx) else if (!parts[i].duration) anything_done = true; parts[i].duration = duration; - if (duration && parts[i].src.start < 0) + if (duration && parts[i].src.start < 0) { if (parts[i].src.end < 0) missing_srcstart = i; else parts[i].src.start = parts[i].src.end - duration; + } } if (!anything_done) { if (missing_duration >= 0) { |