[FFmpeg-devel] [PATCH 1/2] Revert "Move struc FFTContext below SECTION_RODATA"

Timothy Gu timothygu99 at gmail.com
Tue May 26 01:02:32 CEST 2015


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
---
 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
-- 
1.9.1



More information about the ffmpeg-devel mailing list