Mercurial > mplayer.hg
changeset 27454:2eb96f52529a
Drop av_always_inline definition. It is duplicated from libavutil and
unlikely to make any difference. This reduces the diff to upstream.
| author | diego |
|---|---|
| date | Tue, 26 Aug 2008 22:38:12 +0000 |
| parents | bbcf29a2733d |
| children | 7005185f74b8 |
| files | liba52/bitstream.h liba52/liba52_changes.diff |
| diffstat | 2 files changed, 5 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/liba52/bitstream.h Tue Aug 26 21:29:54 2008 +0000 +++ b/liba52/bitstream.h Tue Aug 26 22:38:12 2008 +0000 @@ -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 @@ # 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]));
--- a/liba52/liba52_changes.diff Tue Aug 26 21:29:54 2008 +0000 +++ b/liba52/liba52_changes.diff Tue Aug 26 22:38:12 2008 +0000 @@ -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]));