Merge remote-tracking branch 'shariman/wmall'

[ffmpeg] / libavcodec / arm / vp8_armv6.S

diff --git a/libavcodec/arm/vp8_armv6.S b/libavcodec/arm/vp8_armv6.S
index b995360e0c6eed308ae50e2384384af3b184e067..8a3beb9fbb8462c53e9fe640c5d67d530230f8e6 100644 (file)
--- a/libavcodec/arm/vp8_armv6.S
+++ b/libavcodec/arm/vp8_armv6.S
@@ -240,9 +240,9 @@ A       orrcs           r8,  r8,  r10, lsl r6
         b               5b
 endfunc
 
         b               5b
 endfunc
 

-        .section        .rodata
-zigzag_scan:
+const zigzag_scan

         .byte            0,  2,  8, 16
         .byte           10,  4,  6, 12
         .byte           18, 24, 26, 20
         .byte           14, 22, 28, 30
         .byte            0,  2,  8, 16
         .byte           10,  4,  6, 12
         .byte           18, 24, 26, 20
         .byte           14, 22, 28, 30

+endconst