diff --git a/libavutil/arm/bswap.h b/libavutil/arm/bswap.h
index 611ff0ad5b..c3460e035d 100644
--- a/libavutil/arm/bswap.h
+++ b/libavutil/arm/bswap.h
@@ -39,8 +39,10 @@ static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
 #define av_bswap16 av_bswap16
 static av_always_inline av_const unsigned av_bswap16(unsigned x)
 {
-    __asm__("rev16 %0, %0" : "+r"(x));
-    return x;
+    unsigned y;
+
+    __asm__("rev16 %0, %1" : "=r"(y) : "r"(x));
+    return y;
 }
 #endif
 
@@ -48,17 +50,18 @@ static av_always_inline av_const unsigned av_bswap16(unsigned x)
 #define av_bswap32 av_bswap32
 static av_always_inline av_const uint32_t av_bswap32(uint32_t x)
 {
+    uint32_t y;
 #if HAVE_ARMV6_INLINE
-    __asm__("rev %0, %0" : "+r"(x));
+    __asm__("rev %0, %1" : "=r"(y) : "r"(x));
 #else
     uint32_t t;
-    __asm__ ("eor %1, %0, %0, ror #16 \n\t"
+    __asm__ ("eor %1, %2, %2, ror #16 \n\t"
              "bic %1, %1, #0xFF0000   \n\t"
-             "mov %0, %0, ror #8      \n\t"
+             "mov %0, %2, ror #8      \n\t"
              "eor %0, %0, %1, lsr #8  \n\t"
-             : "+r"(x), "=&r"(t));
+             : "=r"(y), "=&r"(t) : "r"(x));
 #endif /* HAVE_ARMV6_INLINE */
-    return x;
+    return y;
 }
 #endif /* AV_GCC_VERSION_AT_MOST(4,4) */