[SCM] libav/experimental: ARM: change argument/return type of bswap_16() to unsigned 32-bit

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:00:56 UTC 2013


The following commit has been merged in the experimental branch:
commit ac73f1a8169c95a9cd3c42d43849432d63bc5bdd
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Feb 22 00:34:08 2010 +0000

    ARM: change argument/return type of bswap_16() to unsigned 32-bit
    
    This avoids unnecessary masking otherwise added by the compilers.
    
    Originally committed as revision 21953 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavutil/arm/bswap.h b/libavutil/arm/bswap.h
index d7ee84f..87dd8dd 100644
--- a/libavutil/arm/bswap.h
+++ b/libavutil/arm/bswap.h
@@ -27,7 +27,7 @@
 
 #if HAVE_ARMV6
 #define bswap_16 bswap_16
-static av_always_inline av_const uint16_t bswap_16(uint16_t x)
+static av_always_inline av_const unsigned bswap_16(unsigned x)
 {
     __asm { rev16 x, x }
     return x;
@@ -44,7 +44,7 @@ static av_always_inline av_const uint32_t bswap_32(uint32_t x)
 
 #if HAVE_ARMV6
 #define bswap_16 bswap_16
-static av_always_inline av_const uint16_t bswap_16(uint16_t x)
+static av_always_inline av_const unsigned bswap_16(unsigned x)
 {
     __asm__("rev16 %0, %0" : "+r"(x));
     return x;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list