Merge branch 'hardsubx_fix' into struct_rewrite

Author: PunitLodha

.github/workflows/build_linux.yml

@@ -1,6 +1,7 @@
 name: Build CCExtractor on Linux
 
 on:
+  workflow_dispatch:
   push:
     paths:
     - '.github/workflows/build_linux.yml'
@@ -96,7 +97,7 @@ jobs:
           restore-keys: ${{ runner.os }}-cargo-
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.57.0
           override: true
       - name: build
         run: cargo build 

.github/workflows/build_windows.yml

@@ -1,6 +1,7 @@
 name: Build CCExtractor on Windows
 
 on:
+  workflow_dispatch:
   push:
     paths:
       - ".github/workflows/build_windows.yml"
@@ -22,12 +23,12 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
       - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.3.1
       - name: Install llvm and clang
         run: choco install llvm
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.57.0
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
@@ -54,12 +55,12 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
       - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.3.1
       - name: Install llvm and clang
         run: choco install llvm
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.57.0
           override: true
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
@@ -87,19 +88,25 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
       - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.3.1
       - name: Install llvm and clang
         uses: egor-tensin/setup-clang@v1
         with:
           version: latest
           platform: x86
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.57.0
           override: true
           target: i686-pc-windows-msvc
       - name: Install Win 10 SDK
         uses: ilammy/msvc-dev-cmd@v1
+      - name: Clone vcpkg
+        run: git clone --depth 1 --single-branch --recursive https://github.com/microsoft/vcpkg.git
+      - name: Setup vcpkg
+        run: cd vcpkg && bootstrap-vcpkg.bat && vcpkg integrate install
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg install leptonica:x86-windows-static-md
       - name: build Release-Full
         env:
           LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
@@ -123,15 +130,21 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
       - name: Setup MSBuild.exe
-        uses: microsoft/setup-msbuild@v1.0.2
+        uses: microsoft/setup-msbuild@v1.3.1
       - name: Install llvm and clang
         uses: egor-tensin/setup-clang@v1
         with:
           version: latest
           platform: x86
+      - name: Clone vcpkg
+        run: git clone --depth 1 --single-branch --recursive https://github.com/microsoft/vcpkg.git
+      - name: Setup vcpkg
+        run: cd vcpkg && bootstrap-vcpkg.bat && vcpkg integrate install
+      - name: Install dependencies
+        run: cd vcpkg && vcpkg install leptonica:x86-windows-static-md
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.56.0
+          toolchain: 1.57.0
           override: true
           target: i686-pc-windows-msvc
       - name: Install Win 10 SDK

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
       shell: bash
     - name: Setup MSBuild.exe
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v1.3.1
     - name: Install llvm and clang
       uses: egor-tensin/setup-clang@v1
       with:

docs/CHANGES.TXT

@@ -1,11 +1,13 @@
 0.95 (to be released)
 -----------------
+- Fix: respect `-stdout` even if multiple CC tracks are present in a Matroska input file (#1453)
 - Fix: crash in Rust decoder on ATSC1.0 TS Files (#1407)
 - Removed the --with-gui flag for linux/configure and mac/configure (use the Flutter GUI instead)
 - Fix: segmentation fault in using hardsubx
 - New: Add function (and command) that extracts closed caption subtitles as well as burnt-in subtitles from a file in a single pass. (As proposed in issue 726)
 - Refactored: the `general_loop` function has some code moved to a new function
-
+- Fix: WebVTT X-TIMESTAMP-MAP placement (#1463)
+- Disable X-TIMESTAMP-MAP by default (changed option --no-timestamp-map to --timestamp-map)
 
 0.94 (2021-12-14)
 -----------------

src/CMakeLists.txt

@@ -128,7 +128,7 @@ if(WIN32)
     include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_spec_incld/")
     include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/")
     aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/" SOURCEFILE)
-    set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32 winmm)
+    set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32 winmm Bcrypt)
 else (WIN32)
     # Adding some platform specific library path
     link_directories (/opt/local/lib)