ffmpeg | branch: master | Timothy Gu <timothyg...@gmail.com> | Mon May 25
16:02:32 2015 -0700| [2b388e6ddec8dd7a01105273fe47c6e93c762e34] | committer:
Michael Niedermayer
Revert "Move struc FFTContext below SECTION_RODATA"
This reverts commit 599888a48040f4086c9086aae958b7231b37afcc.
The commit does not silence the warning on ELF-based systems, and will be
fixed in the subsequent commit.
Conflicts:
libavcodec/x86/fft_mmx.asm
Signed-off-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2b388e6ddec8dd7a01105273fe47c6e93c762e34
---
libavcodec/x86/fft.asm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/x86/fft.asm b/libavcodec/x86/fft.asm
index 877997e..f233774 100644
--- a/libavcodec/x86/fft.asm
+++ b/libavcodec/x86/fft.asm
@@ -36,8 +36,6 @@
%define pointer resd
%endif
-SECTION_RODATA 32
-
struc FFTContext
.nbits: resd 1
.reverse: resd 1
@@ -53,6 +51,8 @@ struc FFTContext
.imdcthalf:pointer 1
endstruc
+SECTION_RODATA 32
+
%define M_SQRT1_2 0.70710678118654752440
%define M_COS_PI_1_8 0.923879532511287
%define M_COS_PI_3_8 0.38268343236509
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
