From 60890b1df8bbcde9f0ed2dd247ddd69e55f5e9c3 Mon Sep 17 00:00:00 2001
From: Jennessa Ma <jma2@atlassian.com>
Date: Thu, 13 Aug 2026 17:41:29 -0400
Subject: [PATCH] Patch 4: Add option to remove initial padding in aac encoding

---
 libavcodec/aacenc.c | 3 ++-
 libavcodec/aacenc.h | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 94558ff23f3e0..695fdea456e97 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -1162,7 +1162,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
     /* Constants */
     s->last_frame_pb_count = 0;
     avctx->frame_size = 1024;
-    avctx->initial_padding = 1024;
+    avctx->initial_padding = s->options.remove_initial_padding ? 0 : 1024;
     s->lambda = avctx->global_quality > 0 ? avctx->global_quality : 120;
 
     /* Channel map and unspecified bitrate guessing */
@@ -1284,6 +1284,7 @@ static const AVOption aacenc_options[] = {
     {"aac_pns", "Perceptual noise substitution", offsetof(AACEncContext, options.pns), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, AACENC_FLAGS},
     {"aac_tns", "Temporal noise shaping", offsetof(AACEncContext, options.tns), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, AACENC_FLAGS},
     {"aac_pce", "Forces the use of PCEs", offsetof(AACEncContext, options.pce), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, AACENC_FLAGS},
+    {"remove_aac_initial_padding", "Set initial padding to 0 instead of 1024", offsetof(AACEncContext, options.remove_initial_padding), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AACENC_FLAGS},
     FF_AAC_PROFILE_OPTS
     {NULL}
 };
diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index 61a9e6102b166..c123c1a025a8e 100644
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -69,6 +69,7 @@ typedef struct AACEncOptions {
     int pce;
     int mid_side;
     int intensity_stereo;
+    int remove_initial_padding;
 } AACEncOptions;
 
 /**