Declare WMV1/WMV2/VC-1 decoder dependency on the H.263 decoder in configure.

[ffmpeg] / libavcodec / mpc.h

diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h
index 0c1548992fb9771c954772a5af4427b4ca8bd33f..738aede6c5f555858eca7706ff2a10eeca14bd99 100644 (file)
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@@ -20,22 +20,18 @@
  */
 
 /**
- * @file mpc.h Musepack decoder
+ * @file libavcodec/mpc.h Musepack decoder
  * MPEG Audio Layer 1/2 -like codec with frames of 1152 samples
  * divided into 32 subbands.
  */
 
-#ifndef FFMPEG_MPC_H
-#define FFMPEG_MPC_H
+#ifndef AVCODEC_MPC_H
+#define AVCODEC_MPC_H
 
-#include "libavutil/random.h"
+#include "libavutil/lfg.h"
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
-
-#ifdef CONFIG_MPEGAUDIO_HP
-#define USE_HIGHPRECISION
-#endif
 #include "mpegaudio.h"
 
 #include "mpcdata.h"
@@ -66,7 +62,7 @@ typedef struct {
     int cur_frame, frames;
     uint8_t *bits;
     int buf_size;
-    AVRandomState rnd;
+    AVLFG rnd;
     int frames_to_skip;
     /* for synthesis */
     DECLARE_ALIGNED_16(MPA_INT, synth_buf[MPA_MAX_CHANNELS][512*2]);
@@ -74,7 +70,7 @@ typedef struct {
     DECLARE_ALIGNED_16(int32_t, sb_samples[MPA_MAX_CHANNELS][36][SBLIMIT]);
 } MPCContext;
 
-extern void ff_mpc_init();
-extern void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst);
+void ff_mpc_init(void);
+void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst);
 
-#endif /* FFMPEG_MPC_H */
+#endif /* AVCODEC_MPC_H */