[vlc-commits] [Git][videolan/vlc][master] contrib: faad2: update to 2.11.3

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
8fc1905e by Steve Lhomme at 2026-08-22T07:22:42+00:00
contrib: faad2: update to 2.11.3

- - - - -


4 changed files:

- − contrib/src/faad2/0001-decoder-return-early-when-the-object-type-can-t-be-s.patch
- − contrib/src/faad2/0001-specrec-check-the-last-swb_offset-value-is-valid.patch
- contrib/src/faad2/SHA512SUMS
- contrib/src/faad2/rules.mak


Changes:

=====================================
contrib/src/faad2/0001-decoder-return-early-when-the-object-type-can-t-be-s.patch deleted
=====================================
@@ -1,37 +0,0 @@
-From 71e7b0e0c0ccb927af63c2a881958201aebe27de Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Thu, 6 Aug 2026 10:06:17 +0200
-Subject: [PATCH] decoder: return early when the object type can't be supported
-
-No need to allocate a filter bank that will not be used (and may leak).
----
- libfaad/decoder.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libfaad/decoder.c b/libfaad/decoder.c
-index de3b169..cd7ad10 100644
---- a/libfaad/decoder.c
-+++ b/libfaad/decoder.c
-@@ -372,6 +372,9 @@ long NeAACDecInit(NeAACDecHandle hpDecoder,
-     }
- #endif
- 
-+    if (can_decode_ot(hDecoder->object_type) < 0)
-+        return -1;
-+
-     /* must be done before frameLength is divided by 2 for LD */
- #ifdef SSR_DEC
-     if (hDecoder->object_type == SSR)
-@@ -385,9 +388,6 @@ long NeAACDecInit(NeAACDecHandle hpDecoder,
-         hDecoder->frameLength >>= 1;
- #endif
- 
--    if (can_decode_ot(hDecoder->object_type) < 0)
--        return -1;
--
-     return bits;
- }
- 
--- 
-2.52.0.windows.1
-


=====================================
contrib/src/faad2/0001-specrec-check-the-last-swb_offset-value-is-valid.patch deleted
=====================================
@@ -1,28 +0,0 @@
-From 44e0e0abc77d2fccf97de9cbb3740bc6bb56ba36 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Thu, 6 Aug 2026 08:01:23 +0200
-Subject: [PATCH] specrec: check the last swb_offset value is valid
-
-It comes from hDecoder->frameLength and must be at least equal or greater to the
-value before it.
----
- libfaad/specrec.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/libfaad/specrec.c b/libfaad/specrec.c
-index 9b1da2f..d53b4e0 100644
---- a/libfaad/specrec.c
-+++ b/libfaad/specrec.c
-@@ -372,6 +372,9 @@ uint8_t window_grouping_info(NeAACDecStruct *hDecoder, ic_stream *ics)
- #ifdef LD_DEC
-         }
- #endif
-+        if (ics->num_swb > 0 && ics->swb_offset[ics->num_swb] < ics->swb_offset[ics->num_swb-1]) {
-+            return 32;
-+        }
-         return 0;
-     case EIGHT_SHORT_SEQUENCE:
-         ics->num_windows = 8;
--- 
-2.52.0.windows.1
-


=====================================
contrib/src/faad2/SHA512SUMS
=====================================
@@ -1 +1 @@
-fd140c0f4e7946e95a49a8652e26f33b138fc3375da34d5e3a55cdde8a74be429eb6fe0180bd434841022cee3c2ec65fe40dda7440fe0dd2761622174f992490  faad2-2.11.2.tar.gz
+1a468a65b8e738a37b7af5415645e8c45b0c3505fe0794948a6b1f5b17e4f9301c015214584fb534cbfc78f016bfe907a1c88131ab76b728ef1554e4dc7e4551  faad2-2.11.3.tar.gz


=====================================
contrib/src/faad2/rules.mak
=====================================
@@ -1,6 +1,6 @@
 # faad2
 
-FAAD2_VERSION := 2.11.2
+FAAD2_VERSION := 2.11.3
 FAAD2_URL := $(GITHUB)/knik0/faad2/archive/refs/tags/$(FAAD2_VERSION).tar.gz
 
 ifeq ($(findstring $(ARCH),arm),)
@@ -20,8 +20,6 @@ faad2: faad2-$(FAAD2_VERSION).tar.gz .sum-faad2
 ifndef HAVE_FPU
 	$(APPLY) $(SRC)/faad2/faad2-fixed.patch
 endif
-	$(APPLY) $(SRC)/faad2/0001-specrec-check-the-last-swb_offset-value-is-valid.patch
-	$(APPLY) $(SRC)/faad2/0001-decoder-return-early-when-the-object-type-can-t-be-s.patch
 	$(call pkg_static,"libfaad/faad2.pc.in")
 	$(MOVE)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/8fc1905e2e8da25ef98a5e986ae12cab3402aaf3

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/8fc1905e2e8da25ef98a5e986ae12cab3402aaf3
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help