Mercurial > libavformat.hg
comparison ffm.c @ 1443:404048ea11bc libavformat
Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
patch by Steve Lhomme, slhomme divxcorp com
author | diego |
---|---|
date | Wed, 01 Nov 2006 22:39:58 +0000 |
parents | 3b00fb8ef8e4 |
children | 65b7b3ff4ed7 |
comparison
equal
deleted
inserted
replaced
1442:c2b748de9b35 | 1443:404048ea11bc |
---|---|
436 } | 436 } |
437 } | 437 } |
438 ffm->write_index += pos_max; | 438 ffm->write_index += pos_max; |
439 } | 439 } |
440 | 440 |
441 //printf("Adjusted write index from %lld to %lld: pts=%0.6f\n", orig_write_index, ffm->write_index, pts / 1000000.); | 441 //printf("Adjusted write index from %"PRId64" to %"PRId64": pts=%0.6f\n", orig_write_index, ffm->write_index, pts / 1000000.); |
442 //printf("pts range %0.6f - %0.6f\n", get_pts(s, 0) / 1000000. , get_pts(s, ffm->file_size - 2 * FFM_PACKET_SIZE) / 1000000. ); | 442 //printf("pts range %0.6f - %0.6f\n", get_pts(s, 0) / 1000000. , get_pts(s, ffm->file_size - 2 * FFM_PACKET_SIZE) / 1000000. ); |
443 | 443 |
444 end: | 444 end: |
445 url_fseek(pb, ptr, SEEK_SET); | 445 url_fseek(pb, ptr, SEEK_SET); |
446 } | 446 } |
580 case READ_HEADER: | 580 case READ_HEADER: |
581 if (!ffm_is_avail_data(s, FRAME_HEADER_SIZE)) { | 581 if (!ffm_is_avail_data(s, FRAME_HEADER_SIZE)) { |
582 return -EAGAIN; | 582 return -EAGAIN; |
583 } | 583 } |
584 #if 0 | 584 #if 0 |
585 printf("pos=%08Lx spos=%Lx, write_index=%Lx size=%Lx\n", | 585 printf("pos=%08"PRIx64" spos=%"PRIx64", write_index=%"PRIx64" size=%"PRIx64"\n", |
586 url_ftell(&s->pb), s->pb.pos, ffm->write_index, ffm->file_size); | 586 url_ftell(&s->pb), s->pb.pos, ffm->write_index, ffm->file_size); |
587 #endif | 587 #endif |
588 if (ffm_read_data(s, ffm->header, FRAME_HEADER_SIZE, 1) != | 588 if (ffm_read_data(s, ffm->header, FRAME_HEADER_SIZE, 1) != |
589 FRAME_HEADER_SIZE) | 589 FRAME_HEADER_SIZE) |
590 return -EAGAIN; | 590 return -EAGAIN; |
641 | 641 |
642 pos = pos1 + ffm->write_index; | 642 pos = pos1 + ffm->write_index; |
643 if (pos >= ffm->file_size) | 643 if (pos >= ffm->file_size) |
644 pos -= (ffm->file_size - FFM_PACKET_SIZE); | 644 pos -= (ffm->file_size - FFM_PACKET_SIZE); |
645 #ifdef DEBUG_SEEK | 645 #ifdef DEBUG_SEEK |
646 printf("seek to %Lx -> %Lx\n", pos1, pos); | 646 printf("seek to %"PRIx64" -> %"PRIx64"\n", pos1, pos); |
647 #endif | 647 #endif |
648 url_fseek(pb, pos, SEEK_SET); | 648 url_fseek(pb, pos, SEEK_SET); |
649 } | 649 } |
650 | 650 |
651 static int64_t get_pts(AVFormatContext *s, offset_t pos) | 651 static int64_t get_pts(AVFormatContext *s, offset_t pos) |