stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix %lld problems on 64bit builds

Browse source
This commit is contained in:
Andreas Öman 2009-07-19 10:37:34 +00:00
parent 884a11e05e
commit d0898f6ddf
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/channels.c
View file

@ -274,7 +274,7 @@ channel_load_one(htsmsg_t *c, int id)
if((tags = htsmsg_get_list(c, "tags")) != NULL) { if((tags = htsmsg_get_list(c, "tags")) != NULL) {
HTSMSG_FOREACH(f, tags) { HTSMSG_FOREACH(f, tags) {
if(f->hmf_type == HMF_S64) { if(f->hmf_type == HMF_S64) {
snprintf(buf, sizeof(buf), "%lld", f->hmf_s64); snprintf(buf, sizeof(buf), "%" PRId64 , f->hmf_s64);
if((ct = channel_tag_find(buf, 0)) != NULL) if((ct = channel_tag_find(buf, 0)) != NULL)
channel_tag_map(ch, ct, 1); channel_tag_map(ch, ct, 1);

3
src/dvr/dvr_rec.c
View file

@ -631,7 +631,8 @@ dvr_thread_new_pkt(dvr_entry_t *de, th_pkt_t *pkt)
de->de_ts_com_offset += (pkt->pkt_dts - de->de_ts_com_start); de->de_ts_com_offset += (pkt->pkt_dts - de->de_ts_com_start);
de->de_rec_state = DE_RS_RUNNING; de->de_rec_state = DE_RS_RUNNING;
tvhlog(LOG_INFO, "dvr", "%s - Skipped %lld seconds of commercials", tvhlog(LOG_INFO, "dvr",
"%s - Skipped %" PRId64 " seconds of commercials",
de->de_ititle, (pkt->pkt_dts - de->de_ts_com_start) / 1000000); de->de_ititle, (pkt->pkt_dts - de->de_ts_com_start) / 1000000);
goto outputpacket; goto outputpacket;
} }

4
src/parsers.c
View file

@ -858,7 +858,7 @@ parser_deliver(th_transport_t *t, th_stream_t *st, th_pkt_t *pkt)
if(st->st_bad_dts < 5) { if(st->st_bad_dts < 5) {
tvhlog(LOG_ERR, "parser", tvhlog(LOG_ERR, "parser",
"transport %s stream %s, DTS discontinuity. " "transport %s stream %s, DTS discontinuity. "
"DTS = %lld, last = %lld", "DTS = %" PRId64 ", last = %" PRId64,
t->tht_identifier, streaming_component_type2txt(st->st_type), t->tht_identifier, streaming_component_type2txt(st->st_type),
dts, st->st_last_dts); dts, st->st_last_dts);
} }
@ -885,7 +885,7 @@ parser_deliver(th_transport_t *t, th_stream_t *st, th_pkt_t *pkt)
pkt->pkt_pts =av_rescale_q(pts, st->st_tb, AV_TIME_BASE_Q); pkt->pkt_pts =av_rescale_q(pts, st->st_tb, AV_TIME_BASE_Q);
pkt->pkt_duration=av_rescale_q(pkt->pkt_duration, st->st_tb, AV_TIME_BASE_Q); pkt->pkt_duration=av_rescale_q(pkt->pkt_duration, st->st_tb, AV_TIME_BASE_Q);
#if 0 #if 0
printf("%-12s %d %10lld %10lld %d\n", printf("%-12s %d %10"PRId64" %10"PRId64" %d\n",
streaming_component_type2txt(st->st_type), streaming_component_type2txt(st->st_type),
pkt->pkt_frametype, pkt->pkt_frametype,
pkt->pkt_dts, pkt->pkt_dts,