[FFmpeg-cvslog] r16181 - trunk/libavcodec/ac3_parser.c

[mru]

Author: mru
Date: Wed Dec 17 03:30:26 2008
New Revision: 16181

Log:
AC3: fix strict aliasing violation in parser

Modified:
   trunk/libavcodec/ac3_parser.c

Modified: trunk/libavcodec/ac3_parser.c
==============================================================================
--- trunk/libavcodec/ac3_parser.c	(original)
+++ trunk/libavcodec/ac3_parser.c	Wed Dec 17 03:30:26 2008
@@ -158,11 +158,14 @@ static int ac3_sync(uint64_t state, AACA
         int *need_next_header, int *new_frame_start)
 {
     int err;
-    uint64_t tmp = be2me_64(state);
+    union {
+        uint64_t u64;
+        uint8_t  u8[8];
+    } tmp = { be2me_64(state) };
     AC3HeaderInfo hdr;
     GetBitContext gbc;
 
-    init_get_bits(&gbc, ((uint8_t *)&tmp)+8-AC3_HEADER_SIZE, 54);
+    init_get_bits(&gbc, tmp.u8+8-AC3_HEADER_SIZE, 54);
     err = ff_ac3_parse_header(&gbc, &hdr);
 
     if(err < 0)