Beta version 4.6.8: Fix build with GCC.

This commit is contained in:
John Preston 2023-03-09 23:21:34 +04:00
parent f4c9bfa7c2
commit 95a4bf718d
5 changed files with 3 additions and 6 deletions

View File

@ -776,9 +776,6 @@ bool FFMpegLoader::open(crl::time positionMs, float64 speed) {
}
bool FFMpegLoader::openCodecContext() {
int res = 0;
char err[AV_ERROR_MAX_STRING_SIZE] = { 0 };
_codecContext = avcodec_alloc_context3(nullptr);
if (!_codecContext) {
LOG(("Audio Error: "

View File

@ -396,7 +396,6 @@ Loaders::SetupLoaderResult Loaders::setupLoader(
}
auto SpeedDependentPosition = Mixer::Track::SpeedDependentPosition;
auto SpeedIndependentPosition = Mixer::Track::SpeedIndependentPosition;
if (!l) {
std::unique_ptr<AudioPlayerLoader> *loader = nullptr;
switch (audio.type()) {

View File

@ -585,6 +585,7 @@ RUN git init ffmpeg \
--enable-decoder=wmav2 \
--enable-decoder=wmavoice \
--enable-encoder=libopus \
--enable-filter=atempo \
--enable-parser=aac \
--enable-parser=aac_latm \
--enable-parser=flac \

@ -1 +1 @@
Subproject commit 03f812787528c25fb09e52d3a2db2910aced5b0c
Subproject commit f3744c4ba3ddadd47e280a1ef5fbd002d357d10a

2
cmake

@ -1 +1 @@
Subproject commit d3977a83a6c8d7a1551dc457a79e05a3f383aa6f
Subproject commit 49272b960648774c68d2adb7637baddb93c89acc