lavf: move ff_codec_get_tag() and ff_codec_get_id() definitions to internal.h

[ffmpeg] / libavcodec / arm / dsputil_arm.S

diff --git a/libavcodec/arm/dsputil_arm.S b/libavcodec/arm/dsputil_arm.S
index 136551f4c94624eb670d53d7b79177aa69dbb334..78d7ad8e81a96135d199bd4aefff2f1205a1deb0 100644 (file)
--- a/libavcodec/arm/dsputil_arm.S
+++ b/libavcodec/arm/dsputil_arm.S
@@ -20,9 +20,7 @@
 @
 
 #include "config.h"
-#include "asm.S"
-
-        preserve8
+#include "libavutil/arm/asm.S"
 
 #if HAVE_ARMV5TE
 function ff_prefetch_arm, export=1
@@ -632,7 +630,7 @@ function ff_add_pixels_clamped_arm, export=1
         ldrsh           r7,  [r0, #2]
         and             r6,  r4,  #0xFF
         and             r8,  r4,  #0xFF00
-        add             r6,  r5,  r6
+        add             r6,  r6,  r5
         add             r8,  r7,  r8,  lsr #8
         mvn             r5,  r5
         mvn             r7,  r7
@@ -674,7 +672,7 @@ function ff_add_pixels_clamped_arm, export=1
         ldrsh           r7,  [r0, #10]
         and             r6,  r4,  #0xFF
         and             r8,  r4,  #0xFF00
-        add             r6,  r5,  r6
+        add             r6,  r6,  r5
         add             r8,  r7,  r8,  lsr #8
         mvn             r5,  r5
         mvn             r7,  r7