QDM2 compatible decoder

[libav.git] / libavcodec / mpegaudio.c

diff --git a/libavcodec/mpegaudio.c b/libavcodec/mpegaudio.c
index d521acc..7a0b0a3 100644 (file)
--- a/libavcodec/mpegaudio.c
+++ b/libavcodec/mpegaudio.c
@@ -28,8 +28,6 @@
 
 /* currently, cannot change these constants (need to modify
    quantization stage) */
 
 /* currently, cannot change these constants (need to modify
    quantization stage) */

-#define FRAC_BITS 15
-#define WFRAC_BITS  14

 #define MUL(a,b) (((int64_t)(a) * (int64_t)(b)) >> FRAC_BITS)
 #define FIX(a)   ((int)((a) * (1 << FRAC_BITS)))
 
 #define MUL(a,b) (((int64_t)(a) * (int64_t)(b)) >> FRAC_BITS)
 #define FIX(a)   ((int)((a) * (1 << FRAC_BITS)))
 


@@ -785,6 +783,7 @@ static int MPA_encode_close(AVCodecContext *avctx)
     return 0;
 }
 
     return 0;
 }
 

+#ifdef CONFIG_MP2_ENCODER

 AVCodec mp2_encoder = {
     "mp2",
     CODEC_TYPE_AUDIO,
 AVCodec mp2_encoder = {
     "mp2",
     CODEC_TYPE_AUDIO,


@@ -795,5 +794,6 @@ AVCodec mp2_encoder = {
     MPA_encode_close,
     NULL,
 };
     MPA_encode_close,
     NULL,
 };

+#endif // CONFIG_MP2_ENCODER

 
 #undef FIX
 
 #undef FIX