[MPlayer-cvslog] r27486 - in trunk/liba52: bitstream.h liba52_changes.diff

[diego]

Author: diego
Date: Wed Aug 27 00:38:12 2008
New Revision: 27486

Log:
Drop av_always_inline definition. It is duplicated from libavutil and
unlikely to make any difference. This reduces the diff to upstream.


Modified:
   trunk/liba52/bitstream.h
   trunk/liba52/liba52_changes.diff

Modified: trunk/liba52/bitstream.h
==============================================================================
--- trunk/liba52/bitstream.h	(original)
+++ trunk/liba52/bitstream.h	Wed Aug 27 00:38:12 2008
@@ -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
 #	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]));

Modified: trunk/liba52/liba52_changes.diff
==============================================================================
--- trunk/liba52/liba52_changes.diff	(original)
+++ trunk/liba52/liba52_changes.diff	Wed Aug 27 00:38:12 2008
@@ -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]));