aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-04-23 04:37:08 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-04-23 05:30:44 (GMT)
commitb9acc8d7f7a6b9d78da222432eb95c9823f80886 (patch)
tree1f8e39e0c7d4cc73cc770f51b2b4a511a1c5dc92 /common
parent97eaca594a2adbfc3dfc5754ba162aee4144db47 (diff)
Properly represent long constants
This is a cleanup patch that will shutup some gcc4 build troubles. This patch were imported from Fedora 12 set of patches for xawtv. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'common')
-rw-r--r--common/capture.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/common/capture.c b/common/capture.c
index a0b574c..fbc1c8a 100644
--- a/common/capture.c
+++ b/common/capture.c
@@ -527,12 +527,12 @@ movie_writer_stop(struct movie_handle *h)
if (h->vfmt.fmtid != VIDEO_NONE && h->afmt.fmtid != AUDIO_NONE) {
for (frames = 0; frames < 16; frames++) {
- stopby = (uint64_t)(h->frames + frames) * (uint64_t)1000000000000 / h->fps;
+ stopby = (uint64_t)(h->frames + frames) * (uint64_t)1000000000000ULL / h->fps;
if (stopby > h->ats)
break;
}
frames++;
- h->stopby = (uint64_t)(h->frames + frames) * (uint64_t)1000000000000 / h->fps;
+ h->stopby = (uint64_t)(h->frames + frames) * (uint64_t)1000000000000ULL / h->fps;
while (frames) {
movie_grab_put_video(h,NULL);
frames--;
@@ -594,11 +594,11 @@ movie_print_timestamps(struct movie_handle *h)
(h->rdrift > 0) ? '+' : '-',
(int)((abs(h->rdrift) / 1000000000)),
(int)((abs(h->rdrift) % 1000000000) / 10000000),
- (int)(h->rdrift * h->fps / (uint64_t)1000000000000),
+ (int)(h->rdrift * h->fps / (uint64_t)1000000000000ULL),
(h->vdrift > 0) ? '+' : '-',
(int)((abs(h->vdrift) / 1000000000)),
(int)((abs(h->vdrift) % 1000000000) / 10000000),
- (int)(h->vdrift * h->fps / (uint64_t)1000000000000));
+ (int)(h->vdrift * h->fps / (uint64_t)1000000000000ULL));
rec_status(line);
}
@@ -623,7 +623,7 @@ movie_grab_put_video(struct movie_handle *h, struct ng_video_buf **ret)
#endif
/* rate control */
- expected = (buf->info.ts - h->vdrift) * h->fps / (uint64_t)1000000000000;
+ expected = (buf->info.ts - h->vdrift) * h->fps / (uint64_t)1000000000000ULL;
if (expected < h->frames-1) {
if (debug > 1)
fprintf(stderr,"rate: ignoring frame [%d %d]\n",

Privacy Policy