generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
  x86inc: fix stack alignment on win64
  rtpproto: Remove unused defines

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-12-13 12:23:48 +01:00
commit 7897919a88
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/rtpproto.c
View File

@ -40,9 +40,6 @@
#include <sys/poll.h> #include <sys/poll.h>
#endif #endif
#define RTP_TX_BUF_SIZE (64 * 1024)
#define RTP_RX_BUF_SIZE (128 * 1024)
typedef struct RTPContext { typedef struct RTPContext {
URLContext *rtp_hd, *rtcp_hd; URLContext *rtp_hd, *rtcp_hd;
int rtp_fd, rtcp_fd; int rtp_fd, rtcp_fd;

10
libavutil/x86/x86inc.asm
View File

@ -447,7 +447,7 @@ DECLARE_REG 14, R15, 120
%assign %%i xmm_regs_used %assign %%i xmm_regs_used
%rep (xmm_regs_used-6) %rep (xmm_regs_used-6)
%assign %%i %%i-1 %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 %endrep
%endmacro %endmacro
@ -455,8 +455,7 @@ DECLARE_REG 14, R15, 120
%assign xmm_regs_used %1 %assign xmm_regs_used %1
ASSERT xmm_regs_used <= 16 ASSERT xmm_regs_used <= 16
%if xmm_regs_used > 6 %if xmm_regs_used > 6
%assign stack_size_padded (xmm_regs_used-6)*16+16-gprsize-(stack_offset&15) SUB rsp, (xmm_regs_used-6)*16+16
SUB rsp, stack_size_padded
WIN64_PUSH_XMM WIN64_PUSH_XMM
%endif %endif
%endmacro %endmacro
@ -466,8 +465,11 @@ DECLARE_REG 14, R15, 120
%assign %%i xmm_regs_used %assign %%i xmm_regs_used
%rep (xmm_regs_used-6) %rep (xmm_regs_used-6)
%assign %%i %%i-1 %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 %endrep
%if stack_size_padded == 0
add %1, (xmm_regs_used-6)*16+16
%endif
%endif %endif
%if stack_size_padded > 0 %if stack_size_padded > 0
%if stack_size > 0 && (mmsize == 32 || HAVE_ALIGNED_STACK == 0) %if stack_size > 0 && (mmsize == 32 || HAVE_ALIGNED_STACK == 0)