[FFmpeg-cvslog] Merge commit '732510636e597585a79be7d111c88b3f7e174fe7'

James Almer git at videolan.org
Sat Nov 11 22:50:59 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 17:47:10 2017 -0300| [0525722ca03aa6c3c8d828ad278e1870731bfafc] | committer: James Almer

Merge commit '732510636e597585a79be7d111c88b3f7e174fe7'

* commit '732510636e597585a79be7d111c88b3f7e174fe7':
  aarch64: Remove a dot from a label

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0525722ca03aa6c3c8d828ad278e1870731bfafc
---

 libavcodec/aarch64/mpegaudiodsp_neon.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/aarch64/mpegaudiodsp_neon.S b/libavcodec/aarch64/mpegaudiodsp_neon.S
index cc7d9b321c..b6ef131228 100644
--- a/libavcodec/aarch64/mpegaudiodsp_neon.S
+++ b/libavcodec/aarch64/mpegaudiodsp_neon.S
@@ -24,7 +24,7 @@
 #define WFRAC_BITS  16   // fractional bits for window
 #define OUT_SHIFT (WFRAC_BITS + FRAC_BITS - 15)
 
-const   tbl_rev128.s, align=4
+const   tbl_rev128_s, align=4
         .byte           12, 13, 14, 15
         .byte            8,  9, 10, 11
         .byte            4,  5,  6,  7
@@ -39,7 +39,7 @@ function ff_mpadsp_apply_window_\type\()_neon, export=1
         ld1             {v4.4s,v5.4s,v6.4s,v7.4s},  [x7],  #64
         st1             {v0.4s,v1.4s,v2.4s,v3.4s},  [x8],  #64
         st1             {v4.4s,v5.4s,v6.4s,v7.4s},  [x8],  #64
-        movrel          x15, tbl_rev128.s
+        movrel          x15, tbl_rev128_s
         ld1             {v27.4s}, [x15]
 .ifc \type, fixed
         lsl             x4,  x4,  #1


======================================================================




More information about the ffmpeg-cvslog mailing list