This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch master
in repository ffmpeg.

The following commit(s) were added to refs/heads/master by this push:
     new 2a0a32c42b avformat/whip: remove the confused option buffer_size
2a0a32c42b is described below

commit 2a0a32c42b3e58bd122381868b6e62e46b90a369
Author:     Jack Lau <[email protected]>
AuthorDate: Mon Jan 19 23:15:22 2026 +0800
Commit:     Jack Lau <[email protected]>
CommitDate: Thu Jan 29 12:18:22 2026 +0000

    avformat/whip: remove the confused option buffer_size
    
    See https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20965#issuecomment-22815
    
    The buffer_size isn't inlcuded in release/8.0,
    directly use new option ts_buffer_size to replace
    buffer_size shoule be okay.
    
    Signed-off-by: Jack Lau <[email protected]>
---
 doc/muxers.texi    | 4 +---
 libavformat/whip.c | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 9d3ca3624c..e1f737b1d9 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -3955,12 +3955,10 @@ Default value is 5000.
 Set the maximum size, in bytes, of RTP packets that send out.
 Default value is 1200.
 
-@item buffer_size, ts_buffer_size @var{integer}
+@item ts_buffer_size @var{integer}
 Set the buffer size, in bytes, of underlying protocol.
 Default value is -1(auto). The UDP auto selects a reasonable value.
 
-Using the buffer_size option name is deprecated and should not be used.
-
 @item whip_flags @var{flags}
 Possible values:
 
diff --git a/libavformat/whip.c b/libavformat/whip.c
index b5c5929035..8aed0c31e5 100644
--- a/libavformat/whip.c
+++ b/libavformat/whip.c
@@ -2026,11 +2026,9 @@ static int whip_check_bitstream(AVFormatContext *s, 
AVStream *st, const AVPacket
 
 #define OFFSET(x) offsetof(WHIPContext, x)
 #define ENC AV_OPT_FLAG_ENCODING_PARAM
-#define DEP AV_OPT_FLAG_DEPRECATED
 static const AVOption options[] = {
     { "handshake_timeout",  "Timeout in milliseconds for ICE and DTLS 
handshake.",      OFFSET(handshake_timeout),  AV_OPT_TYPE_INT,    { .i64 = 5000 
},    -1, INT_MAX, ENC },
     { "pkt_size",           "The maximum size, in bytes, of RTP packets that 
send out", OFFSET(pkt_size),           AV_OPT_TYPE_INT,    { .i64 = 1200 },    
-1, INT_MAX, ENC },
-    { "buffer_size",        "The buffer size, in bytes, of underlying 
protocol",        OFFSET(ts_buffer_size),        AV_OPT_TYPE_INT,    { .i64 = 
-1 },      -1, INT_MAX, ENC | DEP },
     { "ts_buffer_size",     "The buffer size, in bytes, of underlying 
protocol",        OFFSET(ts_buffer_size),        AV_OPT_TYPE_INT,    { .i64 = 
-1 },      -1, INT_MAX, ENC },
     { "whip_flags",         "Set flags affecting WHIP connection behavior",    
         OFFSET(flags),              AV_OPT_TYPE_FLAGS,  { .i64 = 0},         
0, UINT_MAX, ENC, .unit = "flags" },
     { "dtls_active",        "Set dtls role as active",                         
         0,                          AV_OPT_TYPE_CONST,  { .i64 = 
WHIP_DTLS_ACTIVE}, 0, UINT_MAX, ENC, .unit = "flags" },

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to