diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2005-11-28 12:24:56 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2005-11-28 12:24:56 +0000 |
| commit | 29889061262a94aeb8871b185b29a1699f55af63 (patch) | |
| tree | 5ce0740455e3e6051dbf726abb090165f8abfcec /src/demuxers/demux_slave.c | |
| parent | e9ad6a71dbf9f5f0b1e249ad7969afa1fd8665ba (diff) | |
| download | xine-lib-29889061262a94aeb8871b185b29a1699f55af63.tar.gz xine-lib-29889061262a94aeb8871b185b29a1699f55af63.tar.bz2 | |
*BUGFIX*
Improved cross-compiling: detect and precedence of the host-specific libs
W32dll: enabled by platforms as originaly, user can override it
Fixed shell errors in the Makefile of the hackersguide
Detect the place of SDL header independently on platform
Fixed spelling in CDDA, include the header sys/param.h if available
Fixed format strings (fix warnings (or even bugs) on Gentoo/FreeBSD)
CVS patchset: 7815
CVS date: 2005/11/28 12:24:56
Diffstat (limited to 'src/demuxers/demux_slave.c')
| -rw-r--r-- | src/demuxers/demux_slave.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index aa9e806db..b37909c20 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -21,7 +21,7 @@ */ /* - * $Id: demux_slave.c,v 1.14 2005/02/06 15:26:19 tmattern Exp $ + * $Id: demux_slave.c,v 1.15 2005/11/28 12:24:57 valtri Exp $ * * demuxer for slave "protocol" * master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is, @@ -123,7 +123,7 @@ static int demux_slave_next (demux_slave_t *this) { int64_t disc_off; /* discontinuity offset */ uint32_t decoder_flags; /* stuff like keyframe, is_header ... see below */ - if( sscanf(s,"fifo=%10s size=%d type=%u pts=%lld disc=%lld flags=%u", + if( sscanf(s,"fifo=%10s size=%" SCNd32 " type=%" SCNu32 " pts=%" SCNd64 " disc=%" SCNd64 " flags=%" SCNu32, fifo_name, &size, &type, &pts, &disc_off, &decoder_flags) != 6 ) { lprintf("'buffer' command error\n"); this->status = DEMUX_FINISHED; |