summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers')
-rw-r--r--src/demuxers/demux_avi.c40
-rw-r--r--src/demuxers/demux_film.c12
-rw-r--r--src/demuxers/demux_iff.c4
-rw-r--r--src/demuxers/demux_matroska.c42
-rw-r--r--src/demuxers/demux_slave.c4
-rw-r--r--src/demuxers/ebml.c28
6 files changed, 65 insertions, 65 deletions
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index b2ba15293..4cf6c5b31 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_avi.c,v 1.220 2005/11/01 18:36:19 tmattern Exp $
+ * $Id: demux_avi.c,v 1.221 2005/11/28 12:24:57 valtri Exp $
*
* demultiplexer for avi streams
*
@@ -347,7 +347,7 @@ static void check_newpts (demux_avi_t *this, int64_t pts, int video) {
if (this->send_newpts) {
- lprintf ("sending newpts %lld (video = %d)\n", pts, video);
+ lprintf ("sending newpts %" PRId64 " (video = %d)\n", pts, video);
if (this->buf_flag_seek) {
_x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK);
@@ -415,7 +415,7 @@ static int64_t get_audio_pts (demux_avi_t *this, int track, uint32_t posc,
avi_audio_t *at = this->avi->audio[track];
- lprintf("get_audio_pts: track=%d, posc=%d, postot=%lld, posb=%d\n", track, posc, postot, posb);
+ lprintf("get_audio_pts: track=%d, posc=%d, postot=%" PRIdMAX ", posb=%d\n", track, posc, (intmax_t)postot, posb);
if ((at->dwSampleSize == 0) && (at->dwScale > 1)) {
/* variable bitrate */
@@ -438,8 +438,8 @@ static int64_t get_audio_pts (demux_avi_t *this, int track, uint32_t posc,
}
static int64_t get_video_pts (demux_avi_t *this, off_t pos) {
- lprintf("get_video_pts: dwScale=%d, dwRate=%d, pos=%lld\n",
- this->avi->dwScale, this->avi->dwRate, pos);
+ lprintf("get_video_pts: dwScale=%d, dwRate=%d, pos=%" PRIdMAX "\n",
+ this->avi->dwScale, this->avi->dwRate, (intmax_t)pos);
return (int64_t)(90000.0 * (double)pos *
(double)this->avi->dwScale / (double)this->avi->dwRate);
}
@@ -543,7 +543,7 @@ static int idx_grow(demux_avi_t *this, int (*stopper)(demux_avi_t *, void *),
}
if (this->input->read(this->input, data, AVI_HEADER_SIZE) != AVI_HEADER_SIZE) {
- lprintf("read failed, chunk_pos=%lld\n", chunk_pos);
+ lprintf("read failed, chunk_pos=%" PRIdMAX "\n", (intmax_t)chunk_pos);
break;
}
@@ -634,7 +634,7 @@ static int idx_grow(demux_avi_t *this, int (*stopper)(demux_avi_t *, void *),
}
chunk_pos = this->input->seek(this->input, this->idx_grow.nexttagoffset, SEEK_SET);
if (chunk_pos != this->idx_grow.nexttagoffset) {
- lprintf("seek failed: %lld != %lld\n", chunk_pos, this->idx_grow.nexttagoffset);
+ lprintf("seek failed: %" PRIdMAX " != %" PRIdMAX "\n", (intmax_t)chunk_pos, (intmax_t)this->idx_grow.nexttagoffset);
break;
}
}
@@ -787,7 +787,7 @@ static avi_t *AVI_init(demux_avi_t *this) {
break;
}
- lprintf("chunk: %c%c%c%c, size: %lld\n",
+ lprintf("chunk: %c%c%c%c, size: %" PRId64 "\n",
data[0], data[1], data[2], data[3], (int64_t)n);
if(strncasecmp(data,"LIST",4) == 0) {
@@ -1390,7 +1390,7 @@ static avi_t *AVI_init(demux_avi_t *this) {
AVI->video_posf = 0;
AVI->video_posb = 0;
- lprintf("done, pos=%lld, AVI->movi_start=%lld\n", this->input->get_current_pos(this->input), AVI->movi_start);
+ lprintf("done, pos=%lld, AVI->movi_start=%" PRIdMAX "\n", this->input->get_current_pos(this->input), (intmax_t)AVI->movi_start);
return AVI;
}
@@ -1548,7 +1548,7 @@ static int demux_avi_next (demux_avi_t *this, int decoder_flags) {
audio_pts =
get_audio_pts (this, i, aie->block_no, aie->tot, audio->audio_posb);
- lprintf ("video_pts %lld audio_pts %lld\n", video_pts, audio_pts);
+ lprintf ("video_pts %" PRId64 " audio_pts %" PRId64 "\n", video_pts, audio_pts);
if (!this->no_audio && (audio_pts < video_pts)) {
@@ -1648,9 +1648,9 @@ static int get_chunk_header(demux_avi_t *this, uint32_t *len, int *audio_stream)
break;
*len = LE_32(data + 4);
- lprintf("header: %c%c%c%c, pos=%lld, len=%u\n",
+ lprintf("header: %c%c%c%c, pos=%" PRIdMAX ", len=%u\n",
data[0], data[1], data[2], data[3],
- this->input->get_current_pos(this->input), *len);
+ (intmax_t)this->input->get_current_pos(this->input), *len);
/* Dive into RIFF and LIST entries */
if(strncasecmp(data, "LIST", 4) == 0 ||
@@ -1699,13 +1699,13 @@ static int demux_avi_next_streaming (demux_avi_t *this, int decoder_flags) {
buf_element_t *buf = NULL;
int64_t audio_pts, video_pts;
- int64_t current_pos;
+ off_t current_pos;
int left;
int header, chunk_len, audio_stream;
avi_audio_t *audio;
current_pos = this->input->get_current_pos(this->input);
- lprintf("input_pos=%lld\n", current_pos);
+ lprintf("input_pos=%" PRIdMAX "\n", (intmax_t)current_pos);
header = get_chunk_header(this, &chunk_len, &audio_stream);
@@ -1725,7 +1725,7 @@ static int demux_avi_next_streaming (demux_avi_t *this, int decoder_flags) {
/* read audio */
buf->pts = audio_pts;
- lprintf("audio pts: %lld\n", audio_pts);
+ lprintf("audio pts: %" PRId64 "\n", audio_pts);
if (left > this->audio_fifo->buffer_pool_buf_size) {
buf->size = this->audio_fifo->buffer_pool_buf_size;
@@ -1771,7 +1771,7 @@ static int demux_avi_next_streaming (demux_avi_t *this, int decoder_flags) {
/* read video */
buf->pts = video_pts;
- lprintf("video pts: %lld\n", video_pts);
+ lprintf("video pts: %" PRId64 "\n", video_pts);
if (left > this->video_fifo->buffer_pool_buf_size) {
buf->size = this->video_fifo->buffer_pool_buf_size;
@@ -2145,7 +2145,7 @@ static int demux_avi_seek_internal (demux_avi_t *this) {
* position we've already found, so we won't be seeking though the
* file much at this point. */
- xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "video_pts = %lld\n", video_pts);
+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "video_pts = %" PRId64 "\n", video_pts);
/* FIXME ? */
audio_pts = 77777777;
@@ -2157,7 +2157,7 @@ static int demux_avi_seek_internal (demux_avi_t *this) {
for(i = 0; i < this->avi->n_audio; i++) {
max_pos = this->avi->audio[i]->audio_idx.audio_chunks - 1;
min_pos = 0;
- lprintf("audio_chunks=%d, min=%lld, max=%lld\n", this->avi->audio[i]->audio_idx.audio_chunks, min_pos, max_pos);
+ lprintf("audio_chunks=%d, min=%" PRId64 ", max=%" PRId64 "\n", this->avi->audio[i]->audio_idx.audio_chunks, min_pos, max_pos);
while (min_pos < max_pos) {
cur_pos = this->avi->audio[i]->audio_posc = (max_pos + min_pos) / 2;
if (cur_pos == min_pos) break;
@@ -2168,7 +2168,7 @@ static int demux_avi_seek_internal (demux_avi_t *this) {
} else {
min_pos = cur_pos;
}
- lprintf ("audio_pts = %lld %lld < %lld < %lld\n",
+ lprintf ("audio_pts = %" PRId64 " %" PRId64 " < %" PRId64 " < %" PRId64 "\n",
audio_pts, min_pos, cur_pos, max_pos);
} else {
if (cur_pos > min_pos) {
@@ -2180,7 +2180,7 @@ static int demux_avi_seek_internal (demux_avi_t *this) {
}
}
}
- lprintf ("audio_pts = %lld\n", audio_pts);
+ lprintf ("audio_pts = %" PRId64 "\n", audio_pts);
/*
* try to make audio pos more accurate for long index entries
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 428604c71..9d3ed3f0e 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -21,7 +21,7 @@
* For more information on the FILM file format, visit:
* http://www.pcisys.net/~melanson/codecs/
*
- * $Id: demux_film.c,v 1.78 2005/02/03 07:19:05 valtri Exp $
+ * $Id: demux_film.c,v 1.79 2005/11/28 12:24:57 valtri Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -311,7 +311,7 @@ static int open_film_file(demux_film_t *film) {
if (film->sample_table[j].pts > largest_pts)
largest_pts = film->sample_table[j].pts;
- llprintf(DEBUG_FILM_LOAD, "sample %4d @ %8" PRIxMAX ", %8X bytes, %s, pts %lld, duration %lld%s\n",
+ llprintf(DEBUG_FILM_LOAD, "sample %4d @ %8" PRIxMAX ", %8X bytes, %s, pts %lld, duration %" PRId64 "%s\n",
j,
(intmax_t)film->sample_table[j].sample_offset,
film->sample_table[j].sample_size,
@@ -473,7 +473,7 @@ static int demux_film_send_chunk(demux_plugin_t *this_gen) {
if (!remaining_sample_bytes)
buf->decoder_flags |= BUF_FLAG_FRAME_END;
- llprintf(DEBUG_FILM_DEMUX, "sending video buf with %d bytes, %lld pts, %d duration\n",
+ llprintf(DEBUG_FILM_DEMUX, "sending video buf with %" PRId32 " bytes, %" PRId64 " pts, %" PRId32 " duration\n",
buf->size, buf->pts, buf->decoder_info[0]);
this->video_fifo->put(this->video_fifo, buf);
}
@@ -517,7 +517,7 @@ static int demux_film_send_chunk(demux_plugin_t *this_gen) {
if (!remaining_sample_bytes)
buf->decoder_flags |= BUF_FLAG_FRAME_END;
- llprintf(DEBUG_FILM_DEMUX, "sending video buf with %d bytes, %lld pts, %d duration\n",
+ llprintf(DEBUG_FILM_DEMUX, "sending video buf with %" PRId32 " bytes, %" PRId64 " pts, %" PRId32 " duration\n",
buf->size, buf->pts, buf->decoder_info[0]);
this->video_fifo->put(this->video_fifo, buf);
}
@@ -577,7 +577,7 @@ static int demux_film_send_chunk(demux_plugin_t *this_gen) {
if (!remaining_sample_bytes)
buf->decoder_flags |= BUF_FLAG_FRAME_END;
- llprintf(DEBUG_FILM_DEMUX, "sending mono audio buf with %d bytes, %lld pts, %d duration\n",
+ llprintf(DEBUG_FILM_DEMUX, "sending mono audio buf with %" PRId32 " bytes, %" PRId64 " pts, %" PRId32 " duration\n",
buf->size, buf->pts, buf->decoder_info[0]);
this->audio_fifo->put(this->audio_fifo, buf);
@@ -648,7 +648,7 @@ static int demux_film_send_chunk(demux_plugin_t *this_gen) {
if (!remaining_sample_bytes)
buf->decoder_flags |= BUF_FLAG_FRAME_END;
- llprintf(DEBUG_FILM_DEMUX, "sending stereo audio buf with %d bytes, %lld pts, %d duration\n",
+ llprintf(DEBUG_FILM_DEMUX, "sending stereo audio buf with %" PRId32 " bytes, %" PRId64 " pts, %" PRId32 " duration\n",
buf->size, buf->pts, buf->decoder_info[0]);
this->audio_fifo->put(this->audio_fifo, buf);
}
diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c
index 493595ef8..0dec90169 100644
--- a/src/demuxers/demux_iff.c
+++ b/src/demuxers/demux_iff.c
@@ -36,7 +36,7 @@
* * ANIM (Animations)
* - Animation works fine, without seeking.
*
- * $Id: demux_iff.c,v 1.13 2005/02/06 15:26:16 tmattern Exp $
+ * $Id: demux_iff.c,v 1.14 2005/11/28 12:24:57 valtri Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -927,7 +927,7 @@ static int demux_iff_send_chunk(demux_plugin_t *this_gen) {
buf->decoder_flags |= BUF_FLAG_FRAME_END;
xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
- "sending audio buf with %d bytes, %lld pts, %d duration\n",
+ "sending audio buf with %" PRId32 " bytes, %" PRId64 " pts, %" PRId32 " duration\n",
buf->size, buf->pts, buf->decoder_info[0]);
this->audio_fifo->put(this->audio_fifo, buf);
}
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index bdee3b9b9..ad2ca7729 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.40 2005/10/03 18:22:29 tmattern Exp $
+ * $Id: demux_matroska.c,v 1.41 2005/11/28 12:24:57 valtri Exp $
*
* demultiplexer for matroska streams
*
@@ -163,7 +163,7 @@ static void check_newpts (demux_matroska_t *this, int64_t pts,
if (pts && (this->send_newpts || (track->last_pts && abs(diff)>WRAP_THRESHOLD)) ) {
int i;
- lprintf ("sending newpts %lld, diff %lld, track %d\n", pts, diff, track->track_num);
+ lprintf ("sending newpts %" PRId64 ", diff %" PRId64 ", track %d\n", pts, diff, track->track_num);
if (this->buf_flag_seek) {
_x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK);
@@ -179,7 +179,7 @@ static void check_newpts (demux_matroska_t *this, int64_t pts,
} else {
#ifdef LOG
if (pts)
- lprintf ("diff %lld, track %d\n", diff, track->track_num);
+ lprintf ("diff %" PRId64 ", track %d\n", diff, track->track_num);
#endif
}
@@ -255,7 +255,7 @@ static int parse_info(demux_matroska_t *this) {
this->timecode_scale = 1000000;
}
this->duration = (int)(duration * (double)this->timecode_scale / 1000000.0);
- lprintf("timecode_scale: %lld\n", this->timecode_scale);
+ lprintf("timecode_scale: %" PRId64 "\n", this->timecode_scale);
lprintf("duration: %d\n", this->duration);
return 1;
}
@@ -369,7 +369,7 @@ static void init_codec_video(demux_matroska_t *this, matroska_track_t *track) {
if (track->codec_private_len > buf->max_size) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
- "demux_matroska: private decoder data length (%d) is greater than fifo buffer length (%d)\n",
+ "demux_matroska: private decoder data length (%d) is greater than fifo buffer length (%" PRId32 ")\n",
track->codec_private_len, buf->max_size);
buf->free_buffer(buf);
return;
@@ -408,7 +408,7 @@ static void init_codec_audio(demux_matroska_t *this, matroska_track_t *track) {
if (track->codec_private_len > buf->max_size) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
- "demux_matroska: private decoder data length (%d) is greater than fifo buffer length (%d)\n",
+ "demux_matroska: private decoder data length (%d) is greater than fifo buffer length (%" PRId32 ")\n",
track->codec_private_len, buf->max_size);
buf->free_buffer(buf);
return;
@@ -451,7 +451,7 @@ static void init_codec_real(demux_matroska_t *this, matroska_track_t * track) {
if (track->codec_private_len > buf->max_size) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
- "demux_matroska: private decoder data length (%d) is greater than fifo buffer length (%d)\n",
+ "demux_matroska: private decoder data length (%d) is greater than fifo buffer length (%" PRId32 ")\n",
track->codec_private_len, buf->max_size);
buf->free_buffer(buf);
return;
@@ -505,7 +505,7 @@ static void init_codec_vorbis(demux_matroska_t *this, matroska_track_t *track) {
if (frame[i] > buf->max_size) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
- "demux_matroska: private decoder data length (%d) is greater than fifo buffer length (%d)\n",
+ "demux_matroska: private decoder data length (%d) is greater than fifo buffer length (%" PRId32 ")\n",
frame[i], buf->max_size);
buf->free_buffer(buf);
return;
@@ -788,7 +788,7 @@ static void handle_realvideo (demux_plugin_t *this_gen, matroska_track_t *track,
if (chunk_tab_size > buf->max_size) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
- "demux_matroska: Real Chunk Table length (%d) is greater than fifo buffer length (%d)\n",
+ "demux_matroska: Real Chunk Table length (%d) is greater than fifo buffer length (%" PRId32 ")\n",
chunk_tab_size, buf->max_size);
buf->free_buffer(buf);
return;
@@ -822,7 +822,7 @@ static void handle_sub_ssa (demux_plugin_t *this_gen, matroska_track_t *track,
int dest_len;
int skip = 0;
- lprintf ("pts: %lld, duration: %d\n", data_pts, data_duration);
+ lprintf ("pts: %" PRId64 ", duration: %d\n", data_pts, data_duration);
/* skip ',' */
while (data_len && (commas < 8)) {
if (*data == ',') commas++;
@@ -1665,14 +1665,14 @@ static int parse_block (demux_matroska_t *this, uint64_t block_size,
flags = *data;
data += 1;
- lprintf("track_num: %lld, timecode_diff: %d, flags: 0x%x\n", track_num, timecode_diff, flags);
+ lprintf("track_num: %" PRId64 ", timecode_diff: %d, flags: 0x%x\n", track_num, timecode_diff, flags);
gap = flags & 1;
lacing = (flags >> 1) & 0x3;
if (!find_track_by_id(this, (int)track_num, &track)) {
xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
- "demux_matroska: invalid track id: %lld\n", track_num);
+ "demux_matroska: invalid track id: %" PRId64 "\n", track_num);
return 0;
}
@@ -1696,7 +1696,7 @@ static int parse_block (demux_matroska_t *this, uint64_t block_size,
block_duration = track->default_duration;
xduration = (int64_t)block_duration * (int64_t)90 / (int64_t)1000000;
}
- lprintf("pts: %lld, duration: %lld\n", pts, xduration);
+ lprintf("pts: %" PRId64 ", duration: %" PRId64 "\n", pts, xduration);
check_newpts(this, pts, track);
@@ -1710,7 +1710,7 @@ static int parse_block (demux_matroska_t *this, uint64_t block_size,
lprintf("no lacing\n");
block_size_left = (this->block_data + block_size) - data;
- lprintf("size: %d, block_size: %lld\n", block_size_left, block_size);
+ lprintf("size: %d, block_size: %" PRIu64 "\n", block_size_left, block_size);
if (track->handle_content != NULL) {
track->handle_content((demux_plugin_t *)this, track,
@@ -1863,7 +1863,7 @@ static int parse_block_group(demux_matroska_t *this,
/* should override track duration */
if (!ebml_read_uint(ebml, &elem, &block_duration))
return 0;
- lprintf("duration: %lld\n", block_duration);
+ lprintf("duration: %" PRIu64 "\n", block_duration);
break;
case MATROSKA_ID_CL_REFERENCEBLOCK:
is_key = 0;
@@ -2078,7 +2078,7 @@ static int parse_top_level_head(demux_matroska_t *this, int *next_level) {
off_t current_pos;
current_pos = this->input->get_current_pos(this->input);
- lprintf("current_pos: %lld\n", current_pos);
+ lprintf("current_pos: %" PRIdMAX "\n", (intmax_t)current_pos);
if (!ebml_read_elem_head(ebml, &elem))
return 0;
@@ -2447,16 +2447,16 @@ static int demux_matroska_seek (demux_plugin_t *this_gen,
entry = binary_seek(index, start_pos, start_time);
if (entry == -1) {
- lprintf("seeking for track %d to %s %lld - no entry found/EOS.\n",
+ lprintf("seeking for track %d to %s %" PRIdMAX " - no entry found/EOS.\n",
index->track_num, start_pos ? "pos" : "time",
- start_pos ? (int64_t)start_pos : (int64_t)start_time);
+ start_pos ? (intmax_t)start_pos : (intmax_t)start_time);
this->status = DEMUX_FINISHED;
} else {
- lprintf("seeking for track %d to %s %lld. decision is #%d at %lld/%lld\n",
+ lprintf("seeking for track %d to %s %" PRIdMAX ". decision is #%d at %" PRIu64 "/%" PRIdMAX "\n",
index->track_num, start_pos ? "pos" : "time",
- start_pos ? (int64_t)start_pos : (int64_t)start_time,
- index->track_num, index->timecode[entry], index->pos[entry]);
+ start_pos ? (intmax_t)start_pos : (intmax_t)start_time,
+ index->track_num, index->timecode[entry], (intmax_t)index->pos[entry]);
if (this->input->seek(this->input, index->pos[entry], SEEK_SET) < 0)
this->status = DEMUX_FINISHED;
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;
diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c
index 933185400..88492dde6 100644
--- a/src/demuxers/ebml.c
+++ b/src/demuxers/ebml.c
@@ -20,7 +20,7 @@
* EBML parser
* a lot of ideas from the gstreamer parser
*
- * $Id: ebml.c,v 1.3 2005/02/03 07:19:06 valtri Exp $
+ * $Id: ebml.c,v 1.4 2005/11/28 12:24:57 valtri Exp $
*
*/
#ifdef HAVE_CONFIG_H
@@ -73,14 +73,14 @@ uint32_t ebml_get_next_level(ebml_parser_t *ebml, ebml_elem_t *elem) {
if (ebml->level > 0) {
parent_elem = &ebml->elem_stack[ebml->level - 1];
while ((elem->start + elem->len) >= (parent_elem->start + parent_elem->len)) {
- lprintf("parent: %lld, %lld; elem: %lld, %lld\n",
- parent_elem->start, parent_elem->len, elem->start, elem->len);
+ lprintf("parent: %" PRIdMAX ", %" PRIu64 "; elem: %" PRIdMAX ", %" PRIu64 "\n",
+ (intmax_t)parent_elem->start, parent_elem->len, (intmax_t)elem->start, elem->len);
ebml->level--;
if (ebml->level == 0) break;
parent_elem = &ebml->elem_stack[ebml->level - 1];
}
}
- lprintf("id: 0x%x, len: %lld, next_level: %d\n", elem->id, elem->len, ebml->level);
+ lprintf("id: 0x%x, len: %" PRIu64 ", next_level: %d\n", elem->id, elem->len, ebml->level);
return ebml->level;
}
@@ -231,7 +231,7 @@ int ebml_read_uint(ebml_parser_t *ebml, ebml_elem_t *elem, uint64_t *num) {
if ((elem->len < 1) || (elem->len > 8)) {
xprintf(ebml->xine, XINE_VERBOSITY_LOG,
- "ebml: Invalid integer element size %lld\n", size);
+ "ebml: Invalid integer element size %" PRIu64 "\n", size);
return 0;
}
@@ -253,7 +253,7 @@ int ebml_read_sint (ebml_parser_t *ebml, ebml_elem_t *elem, int64_t *num) {
if ((elem->len < 1) || (elem->len > 8)) {
xprintf(ebml->xine, XINE_VERBOSITY_LOG,
- "ebml: Invalid integer element size %lld\n", size);
+ "ebml: Invalid integer element size %" PRIu64 "\n", size);
return 0;
}
@@ -281,7 +281,7 @@ int ebml_read_float (ebml_parser_t *ebml, ebml_elem_t *elem, double *num) {
if ((size != 4) && (size != 8) && (size != 10)) {
xprintf(ebml->xine, XINE_VERBOSITY_LOG,
- "ebml: Invalid float element size %lld\n", size);
+ "ebml: Invalid float element size %" PRIu64 "\n", size);
return 0;
}
@@ -335,7 +335,7 @@ int ebml_read_master (ebml_parser_t *ebml, ebml_elem_t *elem) {
top_elem->id = elem->id;
ebml->level++;
- lprintf("id: 0x%x, len: %lld, level: %d\n", elem->id, elem->len, ebml->level);
+ lprintf("id: 0x%x, len: %" PRIu64 ", level: %d\n", elem->id, elem->len, ebml->level);
if (ebml->level >= EBML_STACK_SIZE) {
xprintf(ebml->xine, XINE_VERBOSITY_LOG,
"ebml: max level exceeded\n");
@@ -388,7 +388,7 @@ int ebml_check_header(ebml_parser_t *ebml) {
if (!ebml_read_uint (ebml, &elem, &num))
return 0;
- lprintf("ebml_version: %lld\n", num);
+ lprintf("ebml_version: %" PRIu64 "\n", num);
ebml->version = num;
break;
}
@@ -398,7 +398,7 @@ int ebml_check_header(ebml_parser_t *ebml) {
if (!ebml_read_uint (ebml, &elem, &num))
return 0;
- lprintf("ebml_read_version: %lld\n", num);
+ lprintf("ebml_read_version: %" PRIu64 "\n", num);
if (num != EBML_VERSION)
return 0;
ebml->read_version = num;
@@ -410,7 +410,7 @@ int ebml_check_header(ebml_parser_t *ebml) {
if (!ebml_read_uint (ebml, &elem, &num))
return 0;
- lprintf("ebml_max_id_length: %lld\n", num);
+ lprintf("ebml_max_id_length: %" PRIu64 "\n", num);
ebml->max_id_len = num;
break;
}
@@ -420,7 +420,7 @@ int ebml_check_header(ebml_parser_t *ebml) {
if (!ebml_read_uint (ebml, &elem, &num))
return 0;
- lprintf("ebml_max_size_length: %lld\n", num);
+ lprintf("ebml_max_size_length: %" PRIu64 "\n", num);
ebml->max_size_len = num;
break;
}
@@ -444,7 +444,7 @@ int ebml_check_header(ebml_parser_t *ebml) {
if (!ebml_read_uint (ebml, &elem, &num))
return 0;
- lprintf("doctype_version: %lld\n", num);
+ lprintf("doctype_version: %" PRIu64 "\n", num);
ebml->doctype_version = num;
break;
}
@@ -454,7 +454,7 @@ int ebml_check_header(ebml_parser_t *ebml) {
if (!ebml_read_uint (ebml, &elem, &num))
return 0;
- lprintf("doctype_read_version: %lld\n", num);
+ lprintf("doctype_read_version: %" PRIu64 "\n", num);
ebml->doctype_read_version = num;
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-17 15:45:44 +0000