diff options
author | Yaowu Xu <yaowu@google.com> | 2012-08-17 10:05:35 -0700 |
---|---|---|
committer | Yaowu Xu <yaowu@google.com> | 2012-08-20 11:45:01 -0700 |
commit | d71ba03822ced836c3cfd18417c5fda05de3c833 (patch) | |
tree | 76598c6a041509f64c24c23107e11c0f926d8389 /nestegg/src | |
parent | 2b59e14a0023be9d084349d58ee156a49cc674bb (diff) | |
download | libvpx-d71ba03822ced836c3cfd18417c5fda05de3c833.tar libvpx-d71ba03822ced836c3cfd18417c5fda05de3c833.tar.gz libvpx-d71ba03822ced836c3cfd18417c5fda05de3c833.tar.bz2 libvpx-d71ba03822ced836c3cfd18417c5fda05de3c833.zip |
silent compiling warnings for VC9 build
Change-Id: Iaa947e640f27e6f6eaf7d845f243536bca2df513
Diffstat (limited to 'nestegg/src')
-rw-r--r-- | nestegg/src/nestegg.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/nestegg/src/nestegg.c b/nestegg/src/nestegg.c index 63a0e83e5..cc87788fe 100644 --- a/nestegg/src/nestegg.c +++ b/nestegg/src/nestegg.c @@ -1272,7 +1272,7 @@ ne_read_block(nestegg * ctx, uint64_t block_id, uint64_t block_size, nestegg_pac if (total > block_size) return -1; - entry = ne_find_track_entry(ctx, track - 1); + entry = ne_find_track_entry(ctx, (unsigned int)(track - 1)); if (!entry) return -1; @@ -1291,7 +1291,7 @@ ne_read_block(nestegg * ctx, uint64_t block_id, uint64_t block_size, nestegg_pac pkt = ne_alloc(sizeof(*pkt)); pkt->track = track - 1; - pkt->timecode = abs_timecode * tc_scale * track_scale; + pkt->timecode = (uint64_t)(abs_timecode * tc_scale * track_scale); ctx->log(ctx, NESTEGG_LOG_DEBUG, "%sblock t %lld pts %f f %llx frames: %llu", block_id == ID_BLOCK ? "" : "simple", pkt->track, pkt->timecode / 1e9, flags, frames); @@ -1774,35 +1774,35 @@ nestegg_track_video_params(nestegg * ctx, unsigned int track, if (ne_get_uint(entry->video.pixel_width, &value) != 0) return -1; - params->width = value; + params->width = (unsigned int)value; if (ne_get_uint(entry->video.pixel_height, &value) != 0) return -1; - params->height = value; + params->height = (unsigned int)value; value = 0; ne_get_uint(entry->video.pixel_crop_bottom, &value); - params->crop_bottom = value; + params->crop_bottom = (unsigned int)value; value = 0; ne_get_uint(entry->video.pixel_crop_top, &value); - params->crop_top = value; + params->crop_top = (unsigned int)value; value = 0; ne_get_uint(entry->video.pixel_crop_left, &value); - params->crop_left = value; + params->crop_left = (unsigned int)value; value = 0; ne_get_uint(entry->video.pixel_crop_right, &value); - params->crop_right = value; + params->crop_right = (unsigned int)value; value = params->width; ne_get_uint(entry->video.display_width, &value); - params->display_width = value; + params->display_width = (unsigned int)value; value = params->height; ne_get_uint(entry->video.display_height, &value); - params->display_height = value; + params->display_height = (unsigned int)value; return 0; } @@ -1828,11 +1828,11 @@ nestegg_track_audio_params(nestegg * ctx, unsigned int track, value = 1; ne_get_uint(entry->audio.channels, &value); - params->channels = value; + params->channels = (unsigned int)value; value = 16; ne_get_uint(entry->audio.bit_depth, &value); - params->depth = value; + params->depth = (unsigned int)value; return 0; } @@ -1888,7 +1888,7 @@ nestegg_free_packet(nestegg_packet * pkt) int nestegg_packet_track(nestegg_packet * pkt, unsigned int * track) { - *track = pkt->track; + *track = (unsigned int)pkt->track; return 0; } |