Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'

[ffmpeg] / libavcodec / bitstream.c

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index eb36c6f90b377ceb899124dd5284c770640e79cc..aae2dcdce2631ec261b3d111bf5f7d0b927020d2 100644 (file)
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -163,7 +163,7 @@ static int build_table(VLC *vlc, int table_nb_bits, int nb_codes,
     int table_size, table_index, index, code_prefix, symbol, subtable_bits;
     int i, j, k, n, nb, inc;
     uint32_t code;
-    volatile VLC_TYPE (* volatile table)[2];
+    volatile VLC_TYPE (* volatile table)[2]; // the double volatile is needed to prevent a internal compiler error in gcc 4.2
 
     table_size = 1 << table_nb_bits;
     if (table_nb_bits > 30)