From: James Zern Date: Sat, 1 Mar 2014 03:58:33 +0000 (-0800) Subject: nestegg: fix track_scale double->uint64 warning X-Git-Tag: v1.4.0~2172^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb27992d1570c843b358502b9c4250ab50477a58;p=libvpx nestegg: fix track_scale double->uint64 warning Change-Id: I24c024d1b328b9c34289c125c501d2fdc246e92e --- diff --git a/third_party/nestegg/README.webm b/third_party/nestegg/README.webm index 9a436976d..44091500f 100644 --- a/third_party/nestegg/README.webm +++ b/third_party/nestegg/README.webm @@ -16,3 +16,4 @@ Local Modifications: nestegg.c|975 col 6| warning: ‘r’ may be used uninitialized in this function [-Wuninitialized] - add ne_get_uint32 convenience function - fix track_number uint64->uint32 warnings +- fix track_scale double->uint64 warning diff --git a/third_party/nestegg/src/nestegg.c b/third_party/nestegg/src/nestegg.c index 70f034664..e9a0b8a9a 100644 --- a/third_party/nestegg/src/nestegg.c +++ b/third_party/nestegg/src/nestegg.c @@ -1246,7 +1246,7 @@ ne_read_block(nestegg * ctx, uint64_t block_id, uint64_t block_size, nestegg_pac struct cluster * cluster; struct frame * f, * last; struct track_entry * entry; - double track_scale; + const int track_scale = 1; uint64_t track_number, length, frame_sizes[256], cluster_tc, flags, frames, tc_scale, total; unsigned int i, lacing, track; size_t consumed = 0; @@ -1340,8 +1340,6 @@ ne_read_block(nestegg * ctx, uint64_t block_id, uint64_t block_size, nestegg_pac if (!entry) return -1; - track_scale = 1.0; - tc_scale = ne_get_timecode_scale(ctx); assert(ctx->segment.cluster.tail->id == ID_CLUSTER);