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

Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

Browse Source 
* commit '55519926ef855c671d084ccc151056de9e3d3a77':
  x86: Make function prototype comments in assembly code consistent

Conflicts:
	libavcodec/x86/sbrdsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-14 00:01:30 +01:00
parent a9b1936a4e 55519926ef
commit 4104eb44e6
24 changed files with 308 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/x86/sbrdsp.asm
View File

@@ -124,9 +124,9 @@ cglobal sbr_hf_g_filt, 5, 6, 5
.end:
RET
; static void sbr_hf_gen_c(float (*X_high)[2], const float (*X_low)[2],
; const float alpha0[2], const float alpha1[2],
; float bw, int start, int end)
; void ff_sbr_hf_gen_sse(float (*X_high)[2], const float (*X_low)[2],
; const float alpha0[2], const float alpha1[2],
; float bw, int start, int end)
;
cglobal sbr_hf_gen, 4,4,8, X_high, X_low, alpha0, alpha1, BW, S, E
; load alpha factors
@@ -249,7 +249,7 @@ cglobal sbr_neg_odd_64, 1,2,4,z
jne .loop
REP_RET
; sbr_qmf_deint_bfly(float *v, const float *src0, const float *src1)
; void ff_sbr_qmf_deint_bfly_sse2(float *v, const float *src0, const float *src1)
%macro SBR_QMF_DEINT_BFLY 0
cglobal sbr_qmf_deint_bfly, 3,5,8, v,src0,src1,vrev,c
mov cq, 64*4-2*mmsize