RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-09 03:02:13 +00:00
Code Issues Releases Wiki Activity

Drop av_always_inline definition. It is duplicated from libavutil and

Browse Source 
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
This commit is contained in:
diego 2008-08-26 22:38:12 +00:00
parent 03337f15ad
commit 159ef5f70e
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
liba52/bitstream.h
View File

@ -26,12 +26,6 @@
*/ */
/* code from ffmpeg/libavcodec */ /* 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) #if defined(__sparc__) || defined(hpux)
/* /*
* the alt bitstream reader performs unaligned memory accesses; that doesn't work * the alt bitstream reader performs unaligned memory accesses; that doesn't work
@ -47,7 +41,7 @@
# define unaligned32(a) (*(uint32_t*)(a)) # define unaligned32(a) (*(uint32_t*)(a))
#else #else
# ifdef __GNUC__ # ifdef __GNUC__
static av_always_inline uint32_t unaligned32(const void *v) { static inline uint32_t unaligned32(const void *v) {
struct Unaligned { struct Unaligned {
uint32_t i; uint32_t i;
} __attribute__((packed)); } __attribute__((packed));
@ -86,7 +80,7 @@ static inline uint32_t unaligned32(const void *v) {
# else # else
# define swab32(x) __generic_swab32(x) # 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) | return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) |
(((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])); (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3]));

12
liba52/liba52_changes.diff
View File

@ -75,17 +75,11 @@
--- liba52/bitstream.h 2006-06-12 15:05:07.000000000 +0200 --- liba52/bitstream.h 2006-06-12 15:05:07.000000000 +0200
+++ liba52/bitstream.h 2006-06-05 02:23:02.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 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
+/* code from ffmpeg/libavcodec */ +/* 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) +#if defined(__sparc__) || defined(hpux)
+/* +/*
+ * the alt bitstream reader performs unaligned memory accesses; that doesn't work + * the alt bitstream reader performs unaligned memory accesses; that doesn't work
@ -101,7 +95,7 @@
+# define unaligned32(a) (*(uint32_t*)(a)) +# define unaligned32(a) (*(uint32_t*)(a))
+#else +#else
+# ifdef __GNUC__ +# ifdef __GNUC__
+static av_always_inline uint32_t unaligned32(const void *v) { +static inline uint32_t unaligned32(const void *v) {
+ struct Unaligned { + struct Unaligned {
+ uint32_t i; + uint32_t i;
+ } __attribute__((packed)); + } __attribute__((packed));
@ -142,7 +136,7 @@
- (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])) - (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3]))
- -
+# define swab32(x) __generic_swab32(x) +# 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) | + return ((((uint8_t*)&x)[0] << 24) | (((uint8_t*)&x)[1] << 16) |
+ (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3])); + (((uint8_t*)&x)[2] << 8) | (((uint8_t*)&x)[3]));