oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.21.x'

Browse Source
This commit is contained in:
Max Kellermann
2020-05-27 16:16:30 +02:00
parent c5f80dc543 30d97fe8a0
commit 5e93e882c9
12 changed files with 128 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/ffmpeg/Time.hxx
View File

@@ -45,7 +45,7 @@ FfmpegTimeToDouble(int64_t t, const AVRational time_base) noexcept
{
assert(t != (int64_t)AV_NOPTS_VALUE);
return FloatDuration(av_rescale_q(t, time_base, (AVRational){1, 1024}))
return FloatDuration(av_rescale_q(t, time_base, {1, 1024}))
/ 1024;
}
@@ -69,7 +69,7 @@ FromFfmpegTime(int64_t t, const AVRational time_base) noexcept
assert(t != (int64_t)AV_NOPTS_VALUE);
return SongTime::FromMS(av_rescale_q(t, time_base,
(AVRational){1, 1000}));
{1, 1000}));
}
/**