[FFmpeg-devel] [PATCH 1/2] fft: x86: Clear __SECT__ before declaring a structure

[Timothy Gu]

This commit reverts 599888a48.

This silences the following warning:

    libavcodec/x86/fft.asm:54: warning: section flags ignored on section
    redeclaration

The cause of this warning is that because `struc` and `endstruc` attempts to
revert to the previous section state [1]. The section state is stored in the
macro __SECT__ [2], which after 599888a48 is `.rodata`. `.rodata` is therefore
declared twice: once in `SECTION_RODATA`, once during `endstruc`, causing the
warning.

This commit redefines `__SECT__` as empty, working around this problem while
reducing differences to Libav.

[1]: http://www.nasm.us/doc/nasmdoc6.html#section-6.4
[2]: http://www.nasm.us/doc/nasmdoc6.html#section-6.3
---
 libavcodec/x86/fft.asm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavcodec/x86/fft.asm b/libavcodec/x86/fft.asm
index 877997e..2771439 100644
--- a/libavcodec/x86/fft.asm
+++ b/libavcodec/x86/fft.asm
@@ -36,7 +36,7 @@
 %define pointer resd
 %endif
 
-SECTION_RODATA 32
+%define __SECT__
 
 struc FFTContext
     .nbits:    resd 1
@@ -53,6 +53,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