Commit 31b8a4ff authored by François Grisez's avatar François Grisez

Compile msfileplayer.c on Android

Conflicts:
	src/videofilters/mkv.c
parent 636c6b92
......@@ -66,6 +66,7 @@ LOCAL_SRC_FILES = \
voip/bitratecontrol.c \
voip/bitratedriver.c \
voip/qosanalyzer.c \
voip/msfileplayer.c \
utils/dsptools.c \
utils/kiss_fft.c \
utils/kiss_fftr.c \
......
......@@ -2412,7 +2412,7 @@ static int player_get_duration(MSFilter *f, void *arg) {
ms_error("MKVPlayer: cannot get duration. No file is open");
goto fail;
}
*(int *)arg = (int)((((uint64_t)matroska_get_duration(obj->file)) * (uint64_t)matroska_get_timecode_scale(obj->file)) / 1000000UL);
*(int *)arg = (int)((((uint64_t)matroska_get_duration(&obj->file)) * (uint64_t)matroska_get_timecode_scale(&obj->file)) / 1000000UL);
ms_filter_unlock(f);
return 0;
......@@ -2428,7 +2428,7 @@ static int player_get_current_position(MSFilter *f, void *arg) {
ms_error("MKVPlayer: cannot get current duration. No file is open");
goto fail;
}
*(int *)arg = (int)(((uint64_t)matroska_block_get_timestamp(obj->file)) * (uint64_t)matroska_get_timecode_scale(obj->file)) / 1000000UL;
*(int *)arg = (int)(((uint64_t)matroska_block_get_timestamp(&obj->file)) * (uint64_t)matroska_get_timecode_scale(&obj->file)) / 1000000UL;
ms_filter_unlock(f);
return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment