diff --git a/.github/workflows/dvrescue-gui.yml b/.github/workflows/dvrescue-gui.yml index c1e1ac83..c6d1dabe 100644 --- a/.github/workflows/dvrescue-gui.yml +++ b/.github/workflows/dvrescue-gui.yml @@ -11,7 +11,7 @@ jobs: compiler: ['clang-9'] include: - compiler: clang-9 - packages: llvm@13 + packages: llvm@15 env: { 'CC': 'clang', 'CXX': 'clang++' } runs-on: macos-latest @@ -72,7 +72,7 @@ jobs: compiler: ['clang-9'] include: - compiler: clang-9 - packages: llvm@13 + packages: llvm@15 env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' } - qt_version: "6.5.*" qt_modules: "qtmultimedia" @@ -140,7 +140,7 @@ jobs: compiler: ['clang-9'] include: - compiler: clang-9 - packages: llvm@13 + packages: llvm@15 env: { 'CC': 'clang', 'CXX': 'clang++' } runs-on: macos-latest @@ -218,7 +218,7 @@ jobs: compiler: ['clang-9'] include: - compiler: clang-9 - packages: llvm@13 + packages: llvm@15 env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' } - qt_version: "6.5.*" qt_modules: "qtmultimedia" @@ -327,10 +327,10 @@ jobs: -c protocol.version=2 \ submodule update --init --force --recursive --depth=1 - - name: Install Python 3.7 version + - name: Install Python 3.10 version uses: actions/setup-python@v1 with: - python-version: '3.7' + python-version: '3.10' architecture: 'x64' - name: Install compiler and FFmpeg dependencies @@ -411,10 +411,10 @@ jobs: -c protocol.version=2 \ submodule update --init --force --recursive --depth=1 - - name: Install Python 3.7 version + - name: Install Python 3.10 version uses: actions/setup-python@v1 with: - python-version: '3.7' + python-version: '3.10' architecture: 'x64' - name: Install compiler and FFmpeg dependencies diff --git a/Source/ThirdParty/ccdecoder/ccdecoder_subrip.c b/Source/ThirdParty/ccdecoder/ccdecoder_subrip.c index 9033c45f..9c25f38a 100644 --- a/Source/ThirdParty/ccdecoder/ccdecoder_subrip.c +++ b/Source/ThirdParty/ccdecoder/ccdecoder_subrip.c @@ -54,8 +54,11 @@ void to_timestamp(double Value_Double, wchar_t Result[20]) /* Hours */ Hours=value/(60*60*1000); - if (Hours>=1000) - return; /* Not supported */ + if (Hours>=1000) /* Not supported */ + { + memcpy(Result, L"??:??:??.???", 13*sizeof(wchar_t)); + return; + } if (Hours>=100) { Result[pos]=L'0'+(wchar_t)Hours/100; @@ -160,7 +163,7 @@ wchar_t* ccdecoder_subrip_parse(ccdecoder_subrip_handle* handle, ccdecoder_capti to_timestamp(priv->pts, pts_In); to_timestamp(pts, pts_Out); swprintf(ToReturn_Current, ToReturn_size, L"%i\n", (int)priv->Number); ToReturn_Current+=wcslen(ToReturn_Current); - swprintf(ToReturn_Current, ToReturn_size, L"%ls --> %ls\n", pts_In, pts_Out); ToReturn_Current+=wcslen(ToReturn_Current); + swprintf(ToReturn_Current, ToReturn_size-(ToReturn_Current-ToReturn), L"%ls --> %ls\n", pts_In, pts_Out); ToReturn_Current+=wcslen(ToReturn_Current); for (Output_Y=0; priv->Characters[Output_Y][0].value; Output_Y++) { uint8_t attributes=ccdecoder_noattribute;