From 29d2595ad70eaa3ca4ce0fc1e4738ac7cc49497f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 12 Dec 2012 00:01:29 +0200 Subject: [PATCH 1/3] rtpproto: Remove unused defines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/rtpproto.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index aca6a5a849..190dff4bd2 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -40,9 +40,6 @@ #include #endif -#define RTP_TX_BUF_SIZE (64 * 1024) -#define RTP_RX_BUF_SIZE (128 * 1024) - typedef struct RTPContext { URLContext *rtp_hd, *rtcp_hd; int rtp_fd, rtcp_fd; From 140367aff9284a913aaf207f949cb7b116e1b197 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 12 Dec 2012 20:00:22 +0100 Subject: [PATCH 2/3] x86inc: fix stack alignment on win64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavutil/x86/x86inc.asm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index 483ae7b048..de0f22c2dc 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -428,7 +428,7 @@ DECLARE_REG 14, R15, 120 %assign %%i xmm_regs_used %rep (xmm_regs_used-6) %assign %%i %%i-1 - movdqa [rsp + (%%i-6)*16 + stack_size], xmm %+ %%i + movdqa [rsp + (%%i-6)*16 + stack_size + (~stack_offset&8)], xmm %+ %%i %endrep %endmacro @@ -436,8 +436,7 @@ DECLARE_REG 14, R15, 120 %assign xmm_regs_used %1 ASSERT xmm_regs_used <= 16 %if xmm_regs_used > 6 - %assign stack_size_padded (xmm_regs_used-6)*16+16-gprsize-(stack_offset&15) - SUB rsp, stack_size_padded + SUB rsp, (xmm_regs_used-6)*16+16 WIN64_PUSH_XMM %endif %endmacro @@ -447,8 +446,11 @@ DECLARE_REG 14, R15, 120 %assign %%i xmm_regs_used %rep (xmm_regs_used-6) %assign %%i %%i-1 - movdqa xmm %+ %%i, [%1 + (%%i-6)*16+stack_size] + movdqa xmm %+ %%i, [%1 + (%%i-6)*16+stack_size+(~stack_offset&8)] %endrep + %if stack_size_padded == 0 + add %1, (xmm_regs_used-6)*16+16 + %endif %endif %if stack_size_padded > 0 %if stack_size > 0 && (mmsize == 32 || HAVE_ALIGNED_STACK == 0) From 6d5b0092678b2a95dfe209a207550bd2fe9ef646 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Tue, 11 Dec 2012 17:26:10 -0800 Subject: [PATCH 3/3] aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN. Found-by: pawlkt CC: libav-stable@libav.org --- libavcodec/aacdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index f3e9be4aa3..d10a482cad 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2003,7 +2003,7 @@ static void apply_tns(float coef[1024], TemporalNoiseShaping *tns, int w, filt, m, i; int bottom, top, order, start, end, size, inc; float lpc[TNS_MAX_ORDER]; - float tmp[TNS_MAX_ORDER]; + float tmp[TNS_MAX_ORDER + 1]; for (w = 0; w < ics->num_windows; w++) { bottom = ics->num_swb;