correctly interleave audio and video according to specs

[ffmpeg] / libavcodec / mlp.c

diff --git a/libavcodec/mlp.c b/libavcodec/mlp.c
index 2ac2e658f16e5beee1bd716897f567aae8a42182..c522617e0bf930cf730677c08620863cf23e70a0 100644 (file)
--- a/libavcodec/mlp.c
+++ b/libavcodec/mlp.c
@@ -22,6 +22,7 @@
 #include <stdint.h>
 
 #include "libavutil/crc.h"
+#include "libavutil/intreadwrite.h"
 #include "mlp.h"
 
 const uint8_t ff_mlp_huffman_tables[3][18][2] = {
@@ -43,26 +44,14 @@ const uint8_t ff_mlp_huffman_tables[3][18][2] = {
 static int crc_init = 0;
 static AVCRC crc_63[1024];
 static AVCRC crc_1D[1024];
-
-
-static int crc_init_2D = 0;
 static AVCRC crc_2D[1024];
 
-int av_cold ff_mlp_init_crc2D(AVCodecParserContext *s)
-{
-    if (!crc_init_2D) {
-        av_crc_init(crc_2D, 0, 16, 0x002D, sizeof(crc_2D));
-        crc_init_2D = 1;
-    }
-
-    return 0;
-}
-
-void av_cold ff_mlp_init_crc()
+av_cold void ff_mlp_init_crc(void)
 {
     if (!crc_init) {
         av_crc_init(crc_63, 0,  8,   0x63, sizeof(crc_63));
         av_crc_init(crc_1D, 0,  8,   0x1D, sizeof(crc_1D));
+        av_crc_init(crc_2D, 0, 16, 0x002D, sizeof(crc_2D));
         crc_init = 1;
     }
 }