[FFmpeg-cvslog] r16180 - trunk/libavcodec/aac_parser.c

[mru]

Author: mru
Date: Wed Dec 17 03:30:22 2008
New Revision: 16180

Log:
AAC: fix strict aliasing violation in parser

Modified:
   trunk/libavcodec/aac_parser.c

Modified: trunk/libavcodec/aac_parser.c
==============================================================================
--- trunk/libavcodec/aac_parser.c	(original)
+++ trunk/libavcodec/aac_parser.c	Wed Dec 17 03:30:22 2008
@@ -32,10 +32,13 @@ static int aac_sync(uint64_t state, AACA
 {
     GetBitContext bits;
     int size, rdb, ch, sr;
-    uint8_t tmp[8];
+    union {
+        uint64_t u64;
+        uint8_t  u8[8];
+    } tmp;
 
-    AV_WB64(tmp, state);
-    init_get_bits(&bits, tmp+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8);
+    tmp.u64 = be2me_64(state);
+    init_get_bits(&bits, tmp.u8+8-AAC_HEADER_SIZE, AAC_HEADER_SIZE * 8);
 
     if(get_bits(&bits, 12) != 0xfff)
         return 0;