]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
use AV_RL* instead of le2me_*
authoraurel <aurel@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Fri, 1 Feb 2008 23:49:56 +0000 (23:49 +0000)
committeraurel <aurel@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Fri, 1 Feb 2008 23:49:56 +0000 (23:49 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11802 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/s3tc.c

index bc8e3d26568261086f1b47912d5347fafef5bb76..fc035e5778c4058f94cd27507f4dc791812677f9 100644 (file)
@@ -31,8 +31,8 @@ static inline void dxt1_decode_pixels(const uint8_t *s, uint32_t *d,
     unsigned int rb0, rb1, rb2, rb3, g0, g1, g2, g3;
     uint32_t colors[4], pixels;
 
-    c0 = le2me_16(*(uint16_t *)(s));
-    c1 = le2me_16(*(uint16_t *)(s+2));
+    c0 = AV_RL16(s);
+    c1 = AV_RL16(s+2);
 
     rb0  = (c0<<3 | c0<<8) & 0xf800f8;
     rb1  = (c1<<3 | c1<<8) & 0xf800f8;
@@ -60,7 +60,7 @@ static inline void dxt1_decode_pixels(const uint8_t *s, uint32_t *d,
 
     colors[2] = rb2 + g2 + a;
 
-    pixels = le2me_32(*(uint32_t *)(s+4));
+    pixels = AV_RL32(s+4);
     for (y=0; y<4; y++) {
         for (x=0; x<4; x++) {
             a        = (alpha & 0x0f) << 28;