[FFmpeg-cvslog] Merge commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 17:46:48 2017 -0300| [529de4f1b6ae92e27fdd5e2420e03908b31e9425] | committer: James Almer

Merge commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d'

* commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d':
  aarch64: Get rid of a stray double space

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

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

 libavutil/aarch64/asm.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavutil/aarch64/asm.S b/libavutil/aarch64/asm.S
index 2a36de14fa..fd32bf784e 100644
--- a/libavutil/aarch64/asm.S
+++ b/libavutil/aarch64/asm.S
@@ -23,7 +23,7 @@
 #ifdef __ELF__
 #   define ELF
 #else
-#   define ELF  #
+#   define ELF #
 #endif
 
 #if HAVE_AS_FUNC


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