From 01b89feda3caf5574c85db382a3139d2340ac130 Mon Sep 17 00:00:00 2001 From: Haejeong Kim Date: Fri, 21 Jul 2017 10:48:17 +0900 Subject: [PATCH] Change parameter type of time_stamp. double -> int64_t Change-Id: I81de7b6465611f4ba482b75412a2b992b8c3a02b --- formats/ffmpeg/mm_file_format_frame.c | 6 +++--- packaging/libmm-fileinfo.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/formats/ffmpeg/mm_file_format_frame.c b/formats/ffmpeg/mm_file_format_frame.c index a1869fc..071e8c0 100755 --- a/formats/ffmpeg/mm_file_format_frame.c +++ b/formats/ffmpeg/mm_file_format_frame.c @@ -229,7 +229,7 @@ FILE_FORMAT_SUCCESS: return MMFILE_FORMAT_SUCCESS; } -static int __mmfile_get_frame(AVFormatContext *pFormatCtx, double timestamp, bool is_accurate, unsigned char **frame, int *size, int *width, int *height) +static int __mmfile_get_frame(AVFormatContext *pFormatCtx, int64_t timestamp, bool is_accurate, unsigned char **frame, int *size, int *width, int *height) { unsigned int i = 0; @@ -238,7 +238,7 @@ static int __mmfile_get_frame(AVFormatContext *pFormatCtx, double timestamp, boo int videoStream = -1; int key_detected = 0; int got_picture = 0; - double pos = timestamp; + int64_t pos = timestamp; bool find = false; bool first_seek = true; int64_t pts = 0; @@ -328,7 +328,7 @@ static int __mmfile_get_frame(AVFormatContext *pFormatCtx, double timestamp, boo #endif duration = duration * MILLION; if ((duration <= 0) || (duration <= pos)) { - debug_error(DEBUG, "duration error duration[%f] pos[%f]", duration, pos); + debug_error(DEBUG, "duration error duration[%f] pos[%lld]", duration, pos); ret = MMFILE_FORMAT_FAIL; goto exception; } diff --git a/packaging/libmm-fileinfo.spec b/packaging/libmm-fileinfo.spec index 23bc947..83389a1 100755 --- a/packaging/libmm-fileinfo.spec +++ b/packaging/libmm-fileinfo.spec @@ -1,6 +1,6 @@ Name: libmm-fileinfo Summary: Media Fileinfo -Version: 0.6.62 +Version: 0.6.63 Release: 0 Group: System/Libraries License: Apache-2.0 -- 2.7.4