Skip to content

Commit 7d8d11f

Browse files
Merge pull request #961 from g-maxime/ci2
Update CI
2 parents 58176e3 + 2084d28 commit 7d8d11f

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

.github/workflows/dvrescue-gui.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
compiler: ['clang-9']
1212
include:
1313
- compiler: clang-9
14-
packages: llvm@13
14+
packages: llvm@15
1515
env: { 'CC': 'clang', 'CXX': 'clang++' }
1616

1717
runs-on: macos-latest
@@ -72,7 +72,7 @@ jobs:
7272
compiler: ['clang-9']
7373
include:
7474
- compiler: clang-9
75-
packages: llvm@13
75+
packages: llvm@15
7676
env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' }
7777
- qt_version: "6.5.*"
7878
qt_modules: "qtmultimedia"
@@ -140,7 +140,7 @@ jobs:
140140
compiler: ['clang-9']
141141
include:
142142
- compiler: clang-9
143-
packages: llvm@13
143+
packages: llvm@15
144144
env: { 'CC': 'clang', 'CXX': 'clang++' }
145145

146146
runs-on: macos-latest
@@ -218,7 +218,7 @@ jobs:
218218
compiler: ['clang-9']
219219
include:
220220
- compiler: clang-9
221-
packages: llvm@13
221+
packages: llvm@15
222222
env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' }
223223
- qt_version: "6.5.*"
224224
qt_modules: "qtmultimedia"
@@ -327,10 +327,10 @@ jobs:
327327
-c protocol.version=2 \
328328
submodule update --init --force --recursive --depth=1
329329
330-
- name: Install Python 3.7 version
330+
- name: Install Python 3.10 version
331331
uses: actions/setup-python@v1
332332
with:
333-
python-version: '3.7'
333+
python-version: '3.10'
334334
architecture: 'x64'
335335

336336
- name: Install compiler and FFmpeg dependencies
@@ -411,10 +411,10 @@ jobs:
411411
-c protocol.version=2 \
412412
submodule update --init --force --recursive --depth=1
413413
414-
- name: Install Python 3.7 version
414+
- name: Install Python 3.10 version
415415
uses: actions/setup-python@v1
416416
with:
417-
python-version: '3.7'
417+
python-version: '3.10'
418418
architecture: 'x64'
419419

420420
- name: Install compiler and FFmpeg dependencies

Source/ThirdParty/ccdecoder/ccdecoder_subrip.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ void to_timestamp(double Value_Double, wchar_t Result[20])
5454

5555
/* Hours */
5656
Hours=value/(60*60*1000);
57-
if (Hours>=1000)
58-
return; /* Not supported */
57+
if (Hours>=1000) /* Not supported */
58+
{
59+
memcpy(Result, L"??:??:??.???", 13*sizeof(wchar_t));
60+
return;
61+
}
5962
if (Hours>=100)
6063
{
6164
Result[pos]=L'0'+(wchar_t)Hours/100;
@@ -160,7 +163,7 @@ wchar_t* ccdecoder_subrip_parse(ccdecoder_subrip_handle* handle, ccdecoder_capti
160163
to_timestamp(priv->pts, pts_In);
161164
to_timestamp(pts, pts_Out);
162165
swprintf(ToReturn_Current, ToReturn_size, L"%i\n", (int)priv->Number); ToReturn_Current+=wcslen(ToReturn_Current);
163-
swprintf(ToReturn_Current, ToReturn_size, L"%ls --> %ls\n", pts_In, pts_Out); ToReturn_Current+=wcslen(ToReturn_Current);
166+
swprintf(ToReturn_Current, ToReturn_size-(ToReturn_Current-ToReturn), L"%ls --> %ls\n", pts_In, pts_Out); ToReturn_Current+=wcslen(ToReturn_Current);
164167
for (Output_Y=0; priv->Characters[Output_Y][0].value; Output_Y++)
165168
{
166169
uint8_t attributes=ccdecoder_noattribute;

0 commit comments

Comments
 (0)