Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
b71679ec by Steve Lhomme at 2026-01-19T09:11:05+01:00
codec: jpeg: fix size type with newer versions of jpeg library
- - - - -
6d0deb89 by Steve Lhomme at 2026-01-19T09:11:05+01:00
contrib: jpeg: update to version 9f
- - - - -
3 changed files:
- contrib/src/jpeg/SHA512SUMS
- contrib/src/jpeg/rules.mak
- modules/codec/jpeg.c
Changes:
=====================================
contrib/src/jpeg/SHA512SUMS
=====================================
@@ -1 +1 @@
-74ea5af3545657d4ac03f8f7933913112cc2d982f0e379d0e5647f1acac21931468e53806297c30ebe180c7bcf84919a0ac20a4195afb03db03060d57904ef6c
jpegsrc.v9b.tar.gz
+7f733d79cf176c690dcf127352f9aa7ec48000455944f286faae606cdeada6f6865b4a3f9f01bda8947b5b1089bb3e52d2b56879b6e871279ec5cbd1829304dc
jpegsrc.v9f.tar.gz
=====================================
contrib/src/jpeg/rules.mak
=====================================
@@ -1,6 +1,6 @@
# jpeg
-JPEG_VERSION := 9b
+JPEG_VERSION := 9f
JPEG_URL := http://www.ijg.org/files/jpegsrc.v$(JPEG_VERSION).tar.gz
$(TARBALLS)/jpegsrc.v$(JPEG_VERSION).tar.gz:
=====================================
modules/codec/jpeg.c
=====================================
@@ -624,7 +624,11 @@ static block_t *EncodeBlock(encoder_t *p_enc, picture_t
*p_pic)
}
JSAMPIMAGE p_row_pointers = NULL;
+#if JPEG_LIB_VERSION_MAJOR > 9 || (JPEG_LIB_VERSION_MAJOR == 9 &&
JPEG_LIB_VERSION_MINOR >= 4)
+ size_t size = p_block->i_buffer;
+#else
unsigned long size = p_block->i_buffer;
+#endif
/* libjpeg longjmp's there in case of error */
if (setjmp(p_sys->setjmp_buffer))
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/ec4c8c48f6bdf741c23c2e86614c75ca0416b656...6d0deb89c44cfab819efbc2c5318b7cc39c8a50f
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/ec4c8c48f6bdf741c23c2e86614c75ca0416b656...6d0deb89c44cfab819efbc2c5318b7cc39c8a50f
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
