[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: matroska: update to 1.7.0
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC Commits: dc14756a by Steve Lhomme at 2024-06-12T13:49:38+00:00 contrib: matroska: update to 1.7.0 (cherry picked from commit 0b13cf8b2c58f3e99909c426c2186ac5dfff01fe) Signed-off-by: Steve Lhomme- - - - - 2 changed files: - contrib/src/matroska/SHA512SUMS - contrib/src/matroska/rules.mak Changes: = contrib/src/matroska/SHA512SUMS = @@ -1 +1 @@ -271557c4f8836411782991c069a16cd49d7f9b6f209d1f96f6694f0e8bdfdcda3bbf76512c328555252a8c3e45c5adfcfab1e738304bb2ea85786a6f45af3f41 libmatroska-1.6.3.tar.xz +e635958113ab57fb6c7e808d4ad51f87c38ec6ff348b202df1789b34d25ca22bc00fbdf1ec4f386bc803ef3da9f57057bae78ecf22deabdf1399755b1c6fdd3e libmatroska-1.7.0.tar.xz = contrib/src/matroska/rules.mak = @@ -1,6 +1,6 @@ # matroska -MATROSKA_VERSION := 1.6.3 +MATROSKA_VERSION := 1.7.0 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.xz PKGS += matroska View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/dc14756a05b08b1dd1f4e5e1937b89683fee48f5 -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/dc14756a05b08b1dd1f4e5e1937b89683fee48f5 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: configure: only use -static-libgcc if the C++ compiler accepts it
Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC Commits: 41c9458d by Steve Lhomme at 2024-06-12T13:06:52+00:00 configure: only use -static-libgcc if the C++ compiler accepts it newer clang reports that it ignores the command on each C++ file compiled. In the end the static C++ compiler is used on Windows anyway. (cherry picked from commit 8ddd2bdd963fd3ace52e7bf24968238b6cddf80a) Signed-off-by: Steve Lhomme- - - - - f3105733 by Steve Lhomme at 2024-06-12T13:06:52+00:00 configure: don't pass -gcodeview to the linker CFLAGS is added to the linker flags and newer LLVM don't like that. CPPFLAGS is used during C compilation and C++ but not added to LDFLAGS. (cherry picked from commit b700021569c1f16f63c86a9ccd912cfdc7126f41) Signed-off-by: Steve Lhomme - - - - - 1 changed file: - configure.ac Changes: = configure.ac = @@ -219,7 +219,9 @@ case "${host_os}" in *mingw32* | *cygwin* | *wince* | *mingwce*) dnl Force libtool to not link to (shared) libgcc_s when detecting C++ dependencies dnl When doing this test with -static-libgcc it will link on (static) libgcc_eh -CXXFLAGS="${CXXFLAGS} -static-libgcc" +AC_LANG_PUSH(C++) +AX_APPEND_COMPILE_FLAGS([-static-libgcc], [CXXFLAGS], [-Werror]) +AC_LANG_POP(C++) AC_CHECK_TOOL(WINDRES, windres, :) AC_CHECK_TOOL(OBJCOPY, objcopy, :) AC_PREPROC_IFELSE([AC_LANG_PROGRAM( @@ -355,8 +357,7 @@ AC_ARG_ENABLE([pdb], AS_IF([test "${SYS}" = "mingw32"],[ AS_IF([test "${enable_pdb}" = "yes"], [ vlc_build_pdb=1 -AX_APPEND_FLAG([-g -gcodeview],[CFLAGS]) -AX_APPEND_FLAG([-g -gcodeview],[CXXFLAGS]) +AX_APPEND_FLAG([-g -gcodeview],[CPPFLAGS]) LDFLAGS="${LDFLAGS} -Wl,-pdb=" ],[]) ]) View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/656a0f6dce1dce14d27e4dd03cef0e7778d2e136...f3105733322f8135221cb1fff210c8ca450d22f2 -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/656a0f6dce1dce14d27e4dd03cef0e7778d2e136...f3105733322f8135221cb1fff210c8ca450d22f2 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] demux: avi: do not set up invalid bitsperpixel
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC Commits: 656a0f6d by François Cartegnie at 2024-06-12T11:47:57+00:00 demux: avi: do not set up invalid bitsperpixel UINT16_MAX is set and propagated from the bitmap header reader refs #28661 - - - - - 1 changed file: - modules/demux/avi/avi.c Changes: = modules/demux/avi/avi.c = @@ -737,7 +737,8 @@ static int Open( vlc_object_t * p_this ) tk->fmt.video.i_width = p_bih->biWidth; tk->fmt.video.i_visible_height = tk->fmt.video.i_height = p_bih->biHeight; -tk->fmt.video.i_bits_per_pixel = p_bih->biBitCount; +if( p_bih->biBitCount <= 32 ) +tk->fmt.video.i_bits_per_pixel = p_bih->biBitCount; tk->fmt.video.i_frame_rate = tk->i_rate; tk->fmt.video.i_frame_rate_base = tk->i_scale; View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/656a0f6dce1dce14d27e4dd03cef0e7778d2e136 -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/656a0f6dce1dce14d27e4dd03cef0e7778d2e136 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] d3d11_quad: fix bogus pointer type on reset
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC Commits: b0c75254 by Steve Lhomme at 2024-06-12T11:01:47+00:00 d3d11_quad: fix bogus pointer type on reset It should behave the same but it's the wrong type. - - - - - 1 changed file: - modules/video_output/win32/d3d11_quad.c Changes: = modules/video_output/win32/d3d11_quad.c = @@ -74,7 +74,7 @@ void D3D11_RenderQuad(d3d11_device_t *d3d_dev, d3d_quad_t *quad, /* force unbinding the input texture, otherwise we get: * OMSetRenderTargets: Resource being set to OM RenderTarget slot 0 is still bound on input! */ -ID3D11RenderTargetView *reset[D3D11_MAX_SHADER_VIEW] = { 0 }; +ID3D11ShaderResourceView *reset[D3D11_MAX_SHADER_VIEW] = { 0 }; ID3D11DeviceContext_PSSetShaderResources(d3d_dev->d3dcontext, 0, quad->resourceCount, reset); } View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b0c75254581e409f9479cee7c08df5346f64176d -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b0c75254581e409f9479cee7c08df5346f64176d You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] avoid using wcscat_s
Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC Commits: ac6c3502 by Steve Lhomme at 2024-06-12T07:33:02+00:00 avoid using wcscat_s It seems it's not available in Windows XP. https://forum.videolan.org/viewtopic.php?f=14&t=164742&p=544877#p544877 _snwprintf was used before but we can't tell if the whole string was appended properly. - - - - - 2 changed files: - bin/winvlc.c - modules/text_renderer/freetype/fonts/win32.c Changes: = bin/winvlc.c = @@ -217,10 +217,15 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, if( S_OK != SHGetFolderPathW( NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, path ) ) fprintf( stderr, "Can't open the vlc conf PATH\n" ); -else if ( !wcscat_s( path, MAX_PATH, L"\\vlc\\crashdump" ) ) +else { -CheckCrashDump( path ); -eh = InstallCrashHandler( path ); +size_t pathlen = wcslen(path); +if ( pathlen + 1 + wcslen(L"\\vlc\\crashdump" ) <= MAX_PATH ) +{ +wcscpy( &path[pathlen], L"\\vlc\\crashdump" ); +CheckCrashDump( path ); +eh = InstallCrashHandler( path ); +} } } #else = modules/text_renderer/freetype/fonts/win32.c = @@ -169,8 +169,9 @@ static char* GetWindowsFontPath() wchar_t wdir[MAX_PATH]; if( S_OK != SHGetFolderPathW( NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT, wdir ) ) { -GetWindowsDirectoryW( wdir, MAX_PATH ); -wcscat_s( wdir, MAX_PATH, L"\\fonts" ); +UINT wdirlen = GetWindowsDirectoryW( wdir, MAX_PATH ); +if ( wdirlen + 1 + wcslen(L"\\fonts") <= MAX_PATH ) +wcscpy( &wdir[wdirlen], L"\\fonts" ); } return FromWide( wdir ); } View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ac6c3502f33dbe0ffb0d502a14b9f162343a9a61 -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ac6c3502f33dbe0ffb0d502a14b9f162343a9a61 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits