[FFmpeg-cvslog] r20254 - trunk/libavcodec/mlpdec.c

ramiro subversion
Fri Oct 16 18:10:00 CEST 2009


Author: ramiro
Date: Fri Oct 16 18:10:00 2009
New Revision: 20254

Log:
mlp: Only initialize VLC tables once. This caused a crash when multiple
instances of the decoder were started at different times.
Bug reported by Maxim Anisiutkin.

Modified:
   trunk/libavcodec/mlpdec.c

Modified: trunk/libavcodec/mlpdec.c
==============================================================================
--- trunk/libavcodec/mlpdec.c	Fri Oct 16 18:03:26 2009	(r20253)
+++ trunk/libavcodec/mlpdec.c	Fri Oct 16 18:10:00 2009	(r20254)
@@ -155,6 +155,7 @@ static VLC huff_vlc[3];
 
 static av_cold void init_static(void)
 {
+    if (!huff_vlc[0].bits) {
     INIT_VLC_STATIC(&huff_vlc[0], VLC_BITS, 18,
                 &ff_mlp_huffman_tables[0][0][1], 2, 1,
                 &ff_mlp_huffman_tables[0][0][0], 2, 1, 512);
@@ -164,6 +165,7 @@ static av_cold void init_static(void)
     INIT_VLC_STATIC(&huff_vlc[2], VLC_BITS, 15,
                 &ff_mlp_huffman_tables[2][0][1], 2, 1,
                 &ff_mlp_huffman_tables[2][0][0], 2, 1, 512);
+    }
 
     ff_mlp_init_crc();
 }



More information about the ffmpeg-cvslog mailing list