diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-26 22:38:12 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-26 22:38:12 +0000 |
| commit | 159ef5f70eab30e7117e1c224303dd0adc89895c (patch) | |
| tree | b38c4c159f7987c9a975ca8a1f0ae4c964be5e22 /liba52 | |
| parent | 03337f15adc6dcd55c3d3a89270636fd17f836fd (diff) | |
| download | mpv-159ef5f70eab30e7117e1c224303dd0adc89895c.tar.bz2 mpv-159ef5f70eab30e7117e1c224303dd0adc89895c.tar.xz | |
Drop av_always_inline definition. It is duplicated from libavutil and
unlikely to make any difference. This reduces the diff to upstream.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27486 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'liba52')
| -rw-r--r-- | liba52/bitstream.h | 10 | ||||
| -rw-r--r-- | liba52/liba52_changes.diff | 12 |
2 files changed, 5 insertions, 17 deletions
diff --git a/liba52/bitstream.h b/liba52/bitstream.h index f5e6fdee94..63b1823b17 100644 --- a/liba52/bitstream.h +++ b/liba52/bitstream.h @@ -26,12 +26,6 @@ */ /* code from ffmpeg/libavcodec */ -#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0) -# define av_always_inline __attribute__((always_inline)) inline -#else -# define av_always_inline inline -#endif - #if defined(__sparc__) || defined(hpux) /* * the alt bitstream reader performs unaligned memory accesses; that doesn't work @@ -47,7 +41,7 @@ # define unaligned32(a) (*(uint32_t*)(a)) #else # ifdef __GNUC__ -static av_always_inline uint32_t unaligned32(const void *v) { +static inline uint32_t unaligned32(const void *v) { struct Unaligned { uint32_t i; } __attribute__((packed)); @@ -86,7 +80,7 @@ static inline uint32_t unaligned32(const void *v) { # else # define swab32(x) __generic_swab32(x) - static av_always_inline const uint32_t __generic_swab32(uint32_t x) + static inline const uint32_t __generic_swab32(uint32_t x) { return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])); diff --git a/liba52/liba52_changes.diff b/liba52/liba52_changes.diff index 8efd94d1c3..542424ba83 100644 --- a/liba52/liba52_changes.diff +++ b/liba52/liba52_changes.diff @@ -75,17 +75,11 @@ --- liba52/bitstream.h 2006-06-12 15:05:07.000000000 +0200 +++ liba52/bitstream.h 2006-06-05 02:23:02.000000000 +0200 -@@ -21,6 +25,48 @@ +@@ -21,6 +25,42 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +/* code from ffmpeg/libavcodec */ -+#if defined(__GNUC__) && (__GNUC__ > 3 || __GNUC_ == 3 && __GNUC_MINOR__ > 0) -+# define av_always_inline __attribute__((always_inline)) inline -+#else -+# define av_always_inline inline -+#endif -+ +#if defined(__sparc__) || defined(hpux) +/* + * the alt bitstream reader performs unaligned memory accesses; that doesn't work @@ -101,7 +95,7 @@ +# define unaligned32(a) (*(uint32_t*)(a)) +#else +# ifdef __GNUC__ -+static av_always_inline uint32_t unaligned32(const void *v) { ++static inline uint32_t unaligned32(const void *v) { + struct Unaligned { + uint32_t i; + } __attribute__((packed)); @@ -142,7 +136,7 @@ - (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])) - +# define swab32(x) __generic_swab32(x) -+ static av_always_inline const uint32_t __generic_swab32(uint32_t x) ++ static inline const uint32_t __generic_swab32(uint32_t x) + { + return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) | + (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])); |