summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_asf.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers/demux_asf.c')
-rw-r--r--src/demuxers/demux_asf.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index bd48d9466..067889ad5 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.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_asf.c,v 1.192 2007/01/19 01:05:24 dgp85 Exp $
+ * $Id: demux_asf.c,v 1.193 2007/02/20 00:34:55 dgp85 Exp $
*
* demultiplexer for asf streams
*
@@ -641,15 +641,15 @@ static void check_newpts (demux_asf_t *this, int64_t pts, int video, int frame_e
#ifdef LOG
if (pts) {
if (video) {
- printf ("demux_asf: VIDEO: pts = %8lld, diff = %8lld\n", pts, pts - this->last_pts[video]);
+ printf ("demux_asf: VIDEO: pts = %8"PRId64", diff = %8"PRId64"\n", pts, pts - this->last_pts[video]);
} else {
- printf ("demux_asf: AUDIO: pts = %8lld, diff = %8lld\n", pts, pts - this->last_pts[video]);
+ printf ("demux_asf: AUDIO: pts = %8"PRId64", diff = %8"PRId64"\n", pts, pts - this->last_pts[video]);
}
}
#endif
if (pts && (this->send_newpts || (this->last_pts[video] && abs(diff) > WRAP_THRESHOLD))) {
- lprintf ("sending newpts %lld (video = %d diff = %lld)\n", pts, video, diff);
+ lprintf ("sending newpts %"PRId64" (video = %d diff = %"PRId64")\n", pts, video, diff);
if (this->buf_flag_seek) {
_x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK);
@@ -676,7 +676,7 @@ static void asf_send_buffer_nodefrag (demux_asf_t *this, asf_demux_stream_t *str
int bufsize;
int package_done;
- lprintf ("pts=%lld, off=%d, len=%d, total=%d\n",
+ lprintf ("pts=%"PRId64", off=%d, len=%d, total=%d\n",
timestamp * 90, frag_offset, frag_len, stream->payload_size);
if (frag_offset == 0) {
@@ -760,7 +760,7 @@ static void asf_send_buffer_defrag (demux_asf_t *this, asf_demux_stream_t *strea
printf("asf_send_buffer seq=%d frag_offset=%d frag_len=%d\n",
seq, frag_offset, frag_len );
*/
- lprintf ("asf_send_buffer_defrag: timestamp=%lld, pts=%lld\n", timestamp, timestamp * 90);
+ lprintf ("asf_send_buffer_defrag: timestamp=%"PRId64", pts=%"PRId64"\n", timestamp, timestamp * 90);
if (frag_offset == 0) {
/* new packet */
@@ -866,11 +866,11 @@ static int asf_parse_packet_align(demux_asf_t *this) {
/* check packet_count */
packet_num = (packet_pos - this->first_packet_pos) / this->packet_size;
- lprintf("packet_num=%lld, packet_count=%lld\n", packet_num, this->packet_count);
+ lprintf("packet_num=%"PRId64", packet_count=%"PRId64"\n", packet_num, this->packet_count);
if (packet_num >= this->packet_count) {
/* end of payload data */
current_pos = this->input->get_current_pos (this->input);
- lprintf("end of payload data, current_pos=%lld\n", current_pos);
+ lprintf("end of payload data, current_pos=%"PRId64"\n", current_pos);
{
/* check new asf header */
if (get_guid(this) == GUID_ASF_HEADER) {
@@ -1000,7 +1000,7 @@ static int asf_parse_packet_payload_header(demux_asf_t *this, uint32_t p_hdr_siz
timestamp = get_le32(this); p_hdr_size += 4;
duration = get_le16(this); p_hdr_size += 2;
- lprintf ("timestamp=%lld, duration=%lld\n", timestamp, duration);
+ lprintf ("timestamp=%"PRId64", duration=%"PRId64"\n", timestamp, duration);
if ((this->packet_len_flags >> 5) & 3) {
/* absolute data size */
@@ -1790,7 +1790,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
int i, state;
int64_t ts;
- lprintf ("demux_asf_seek: start_pos=%lld, start_time=%d\n",
+ lprintf ("demux_asf_seek: start_pos=%"PRId64", start_time=%d\n",
start_pos, start_time);
this->status = DEMUX_OK;
@@ -1911,13 +1911,13 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
}
state = 1; /* search an audio packet with pts < this->keyframe_pts */
- lprintf ("demux_asf_seek: keyframe found at %lld, timestamp = %lld\n", start_pos, ts);
+ lprintf ("demux_asf_seek: keyframe found at %"PRId64", timestamp = %"PRId64"\n", start_pos, ts);
check_newpts (this, ts * 90, 1, 0);
}
} else if (state == 1) {
if ((this->audio_stream != -1 && stream_id == this->asf_header->streams[this->audio_stream]->stream_number) && ts &&
(ts <= this->keyframe_ts)) {
- lprintf ("demux_asf_seek: audio packet found at %lld, ts = %lld\n", start_pos, ts);
+ lprintf ("demux_asf_seek: audio packet found at %"PRId64", ts = %"PRId64"\n", start_pos, ts);
state = 5; /* end */
break;
@@ -1928,7 +1928,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
this->keyframe_ts = ts;
state = 5; /* end */
- lprintf ("demux_asf_seek: audio packet found at %lld, timestamp = %lld\n", start_pos, ts);
+ lprintf ("demux_asf_seek: audio packet found at %"PRId64", timestamp = %"PRId64"\n", start_pos, ts);
check_newpts (this, ts * 90, 0, 0);
}
}
@@ -1942,7 +1942,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen,
} else {
this->input->seek (this->input, start_pos + this->packet_size, SEEK_SET);
}
- lprintf ("demux_asf_seek: keyframe_found=%d, keyframe_ts=%lld\n",
+ lprintf ("demux_asf_seek: keyframe_found=%d, keyframe_ts=%"PRId64"\n",
this->keyframe_found, this->keyframe_ts);
if (this->video_stream >= 0) {
this->streams[this->video_stream].resync = 1;