diff options
Diffstat (limited to 'src/demuxers/demux_matroska.c')
| -rw-r--r-- | src/demuxers/demux_matroska.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index e37fc81e3..6df061197 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_matroska.c,v 1.30 2004/08/27 21:07:31 miguelfreitas Exp $ + * $Id: demux_matroska.c,v 1.31 2004/09/17 19:21:34 valtri Exp $ * * demultiplexer for matroska streams * @@ -1448,8 +1448,9 @@ static int parse_ebml_uint(demux_matroska_t *this, uint8_t *data, uint64_t *num) } if (size > 8) { off_t pos = this->input->get_current_pos(this->input); - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - "demux_matroska: Invalid Track Number at position %llu\n", pos); + xprintf(this->stream->xine, XINE_VERBOSITY_LOG, + "demux_matroska: Invalid Track Number at position %" PRIiMAX "\n", + (intmax_t)pos); return 0; } @@ -1502,7 +1503,8 @@ static int read_block_data (demux_matroska_t *this, int len) { if (this->input->read(this->input, this->block_data, len) != len) { off_t pos = this->input->get_current_pos(this->input); xprintf(this->stream->xine, XINE_VERBOSITY_LOG, - "demux_matroska: read error at position %llu\n", pos); + "demux_matroska: read error at position %" PRIiMAX "\n", + (intmax_t)pos); return 0; } return 1; @@ -1871,7 +1873,8 @@ static int parse_seek_entry(demux_matroska_t *this) { this->ebml->level = 1; if (this->input->seek(this->input, seek_pos, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %lld\n", seek_pos); + "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + (intmax_t)seek_pos); return 0; } if (!parse_top_level_head(this, &next_level)) @@ -1881,12 +1884,14 @@ static int parse_seek_entry(demux_matroska_t *this) { memcpy(this->ebml, &ebml_bak, sizeof(ebml_parser_t)); /* FIXME */ if (this->input->seek(this->input, current_pos, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %lld\n", current_pos); + "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + (intmax_t)current_pos); return 0; } } else { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: out of stream seek pos: %lld\n", seek_pos); + "demux_matroska: out of stream seek pos: %" PRIiMAX "\n", + (intmax_t)seek_pos); } return 1; } else { @@ -2173,7 +2178,8 @@ static void demux_matroska_send_headers (demux_plugin_t *this_gen) { next_level = 1; if (this->input->seek(this->input, this->segment.start, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %lld\n", this->segment.start); + "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + (intmax_t)this->segment.start); this->status = DEMUX_FINISHED; return; } @@ -2192,7 +2198,8 @@ static void demux_matroska_send_headers (demux_plugin_t *this_gen) { next_level = 1; if (this->input->seek(this->input, this->segment.start, SEEK_SET) < 0) { xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, - "demux_matroska: failed to seek to pos: %lld\n", this->segment.start); + "demux_matroska: failed to seek to pos: %" PRIiMAX "\n", + (intmax_t)this->segment.start); this->status = DEMUX_FINISHED; } } |