[FIX] Rename generic bitstream.h to cc_bitstream.h #1436 (#1543)

* fix: rename bitstream * fix: update vcpkg commit hash * fix: try to fix the linker error
CCExtractor · Jul 5, 2023 · 35e73c1 · 35e73c1
1 parent 5b76669
commit 35e73c1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -40,8 +40,8 @@ jobs:
         id: vcpkg
         uses: friendlyanon/setup-vcpkg@v1
         with:
-          committish: "217194cea7e3491c14779c763beec50b6a4575d6"
-          cache-version: "1"
+          committish: "2023.06.20"
+          cache-version: "2"
           ignore-reserve-cache-error: true
       - name: Install dependencies
         run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static
@@ -76,8 +76,8 @@ jobs:
         id: vcpkg
         uses: friendlyanon/setup-vcpkg@v1
         with:
-          committish: "217194cea7e3491c14779c763beec50b6a4575d6"
-          cache-version: "1"
+          committish: "2023.06.20"
+          cache-version: "2"
           ignore-reserve-cache-error: true
       - name: Install dependencies
         run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static

diff --git a/linux/Makefile.am b/linux/Makefile.am
@@ -115,7 +115,7 @@ ccextractor_SOURCES = \
 				../src/lib_ccx/activity.h \
 				../src/lib_ccx/asf_constants.h \
 				../src/lib_ccx/avc_functions.h \
-				../src/lib_ccx/bitstream.h \
+				../src/lib_ccx/cc_bitstream.h \
 				../src/lib_ccx/ccx_common_option.c \
 				../src/lib_ccx/ccx_common_common.c \
 				../src/lib_ccx/compile_info_real.h \

diff --git a/mac/Makefile.am b/mac/Makefile.am
@@ -115,7 +115,7 @@ ccextractor_SOURCES = \
 				../src/lib_ccx/activity.h \
 				../src/lib_ccx/asf_constants.h \
 				../src/lib_ccx/avc_functions.h \
-				../src/lib_ccx/bitstream.h \
+				../src/lib_ccx/cc_bitstream.h \
 				../src/lib_ccx/ccx_common_option.c \
 				../src/lib_ccx/ccx_common_common.c \
 				../src/lib_ccx/utility.c \

diff --git a/src/lib_ccx/bitstream.h → src/lib_ccx/cc_bitstream.h b/src/lib_ccx/bitstream.h → src/lib_ccx/cc_bitstream.h
diff --git a/src/lib_ccx/lib_ccx.h b/src/lib_ccx/lib_ccx.h
@@ -15,7 +15,7 @@
 #include "ccx_demuxer.h"
 #include "ccx_encoders_common.h"
 #include "ccx_decoders_common.h"
-#include "bitstream.h"
+#include "cc_bitstream.h"
 
 #include "networking.h"
 #include "avc_functions.h"

diff --git a/windows/ccextractor.vcxproj b/windows/ccextractor.vcxproj
@@ -336,7 +336,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>
-        ccx_rust.lib;UserEnv.lib;Crypt32.lib;WS2_32.Lib;Bcrypt.lib;Mfplat.lib;Mfuuid.lib;Secur32.lib;Strmiids.lib;Ole32.lib;User32.lib;libcrypto.lib;libcurl.lib;avcodec.lib;avformat.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;leptonica-1.83.1.lib;tesseract53.lib;gif.lib;archive.lib;avdevice.lib;bz2.lib;charset.lib;iconv.lib;jpeg.lib;libpng16.lib;libsharpyuv.lib;libssl.lib;libwebp.lib;libwebpdecoder.lib;libwebpdemux.lib;libwebpmux.lib;libxml2.lib;lz4.lib;lzma.lib;openjp2.lib;tiff.lib;turbojpeg.lib;zlib.lib;zstd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+        ccx_rust.lib;UserEnv.lib;Crypt32.lib;WS2_32.Lib;ntdll.lib;Bcrypt.lib;Mfplat.lib;Mfuuid.lib;Secur32.lib;Strmiids.lib;Ole32.lib;User32.lib;libcrypto.lib;libcurl.lib;avcodec.lib;avformat.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;leptonica-1.83.1.lib;tesseract53.lib;gif.lib;archive.lib;avdevice.lib;bz2.lib;charset.lib;iconv.lib;jpeg.lib;libpng16.lib;libsharpyuv.lib;libssl.lib;libwebp.lib;libwebpdecoder.lib;libwebpdemux.lib;libwebpmux.lib;libxml2.lib;lz4.lib;lzma.lib;openjp2.lib;tiff.lib;turbojpeg.lib;zlib.lib;zstd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ShowProgress>NotSet</ShowProgress>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -367,7 +367,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>
-        ccx_rust.lib;UserEnv.lib;Crypt32.lib;WS2_32.Lib;Bcrypt.lib;Mfplat.lib;Mfuuid.lib;Secur32.lib;Strmiids.lib;Ole32.lib;User32.lib;libcrypto.lib;libcurl.lib;avcodec.lib;avformat.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;leptonica-1.83.1.lib;tesseract53.lib;gif.lib;archive.lib;avdevice.lib;bz2.lib;charset.lib;iconv.lib;jpeg.lib;libpng16.lib;libsharpyuv.lib;libssl.lib;libwebp.lib;libwebpdecoder.lib;libwebpdemux.lib;libwebpmux.lib;libxml2.lib;lz4.lib;lzma.lib;openjp2.lib;tiff.lib;turbojpeg.lib;zlib.lib;zstd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+        ccx_rust.lib;UserEnv.lib;Crypt32.lib;WS2_32.Lib;ntdll.lib;Bcrypt.lib;Mfplat.lib;Mfuuid.lib;Secur32.lib;Strmiids.lib;Ole32.lib;User32.lib;libcrypto.lib;libcurl.lib;avcodec.lib;avformat.lib;avutil.lib;avfilter.lib;swscale.lib;swresample.lib;leptonica-1.83.1.lib;tesseract53.lib;gif.lib;archive.lib;avdevice.lib;bz2.lib;charset.lib;iconv.lib;jpeg.lib;libpng16.lib;libsharpyuv.lib;libssl.lib;libwebp.lib;libwebpdecoder.lib;libwebpdemux.lib;libwebpmux.lib;libxml2.lib;lz4.lib;lzma.lib;openjp2.lib;tiff.lib;turbojpeg.lib;zlib.lib;zstd.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>