[SCM] libav/experimental: reverse earlier patch
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:37:04 UTC 2013
The following commit has been merged in the experimental branch:
commit 966df5b6b3c4a06de65f913eb65232ae357066c2
Author: Mike Melanson <mike at multimedia.cx>
Date: Tue Aug 12 10:00:31 2003 +0000
reverse earlier patch
Originally committed as revision 2121 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/common.h b/libavcodec/common.h
index 516522a..73da2c5 100644
--- a/libavcodec/common.h
+++ b/libavcodec/common.h
@@ -1045,11 +1045,8 @@ static inline int ff_sqrt(int a)
*/
static inline int ff_get_fourcc(const char *s){
assert( strlen(s)==4 );
-#ifndef WORDS_BIGENDIAN
+
return (s[0]) + (s[1]<<8) + (s[2]<<16) + (s[3]<<24);
-#else
- return (s[3]) + (s[2]<<8) + (s[1]<<16) + (s[0]<<24);
-#endif
}
#define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24))
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list