diff options
| author | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-01 22:52:33 +0200 |
| commit | 1aa2e36122e6e664e42170f47d6db82873bef5aa (patch) | |
| tree | 39e13f93bcb606da9e365c7cd379132bdf53c20b /stream | |
| parent | fea8c85c8595b797fc839b113c1db252fc55c798 (diff) | |
| parent | 8cd71527ade21ea27ea24cdcc66dc71dca460f85 (diff) | |
| download | mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.bz2 mpv-1aa2e36122e6e664e42170f47d6db82873bef5aa.tar.xz | |
Merge remote-tracking branch 'origin/master'
Conflicts:
bstr.c
bstr.h
etc/input.conf
input/input.c
input/input.h
libao2/ao_pulse.c
libmpcodecs/vf_ass.c
libmpcodecs/vf_vo.c
libvo/gl_common.c
libvo/x11_common.c
mixer.c
mixer.h
mplayer.c
Diffstat (limited to 'stream')
| -rw-r--r-- | stream/stream_vstream.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/stream/stream_vstream.c b/stream/stream_vstream.c index 3bc096f71b..380b682c46 100644 --- a/stream/stream_vstream.c +++ b/stream/stream_vstream.c @@ -56,7 +56,7 @@ void vstream_error(const char *format, ...) { va_start(va, format); vsnprintf(buf, 1024, format, va); va_end(va); - mp_msg(MSGT_STREAM, MSGL_ERR, buf); + mp_msg(MSGT_STREAM, MSGL_ERR, "%s", buf); } static struct stream_priv_s { @@ -152,7 +152,8 @@ static int open_s(stream_t *stream, int mode, void* opts, int* file_format) { stream->start_pos = 0; stream->end_pos = vstream_streamsize(); - mp_msg(MSGT_OPEN, MSGL_DBG2, "Tivo stream size is %d\n", stream->end_pos); + mp_msg(MSGT_OPEN, MSGL_DBG2, "Tivo stream size is %lld\n", + (long long)stream->end_pos); stream->priv = p; stream->fill_buffer = fill_buffer; |