diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 00:13:11 +0200 |
commit | 13221a716588dc88c1151e0a0f8eb7cce41d461c (patch) | |
tree | 3184184f1e984d248e2570ffa05c79589d2c9a1c /libmpdemux/demux_lavf.c | |
parent | c4f7b9666f753b320157e6497f9114523878885f (diff) | |
parent | bb54613ac1211c73a3614db6b7326d7cd9be39da (diff) |
Merge svn changes up to r30663
Conflicts:
gui/cfg.c
libmpcodecs/vd_dmo.c
mplayer.c
Diffstat (limited to 'libmpdemux/demux_lavf.c')
-rw-r--r-- | libmpdemux/demux_lavf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 8e9208b71c..921f9decc4 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -95,7 +95,7 @@ static int mp_read(void *opaque, uint8_t *buf, int size) { static int64_t mp_seek(void *opaque, int64_t pos, int whence) { stream_t *stream = opaque; int64_t current_pos; - mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %d, %d)\n", stream, (int)pos, whence); + mp_msg(MSGT_HEADER,MSGL_DBG2,"mp_seek(%p, %"PRId64", %d)\n", stream, pos, whence); if(whence == SEEK_CUR) pos +=stream_tell(stream); else if(whence == SEEK_END && stream->end_pos > 0) |