Merge commit '9a3202a98b2e095b54dd784c3e01a09a676fc3fa'

[ffmpeg] / libavcodec / nellymoser.c

diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c
index 00c2cfd3a11fb8f321cd865a760cfd8ada0fae31..0740c75a0f09873690a4c047e1ef6ea2b72cae70 100644 (file)
--- a/libavcodec/nellymoser.c
+++ b/libavcodec/nellymoser.c
@@ -26,17 +26,16 @@
  */
 
 /**
- * @file libavcodec/nellymoser.c
+ * @file
  * The 3 alphanumeric copyright notices are md5summed they are from the original
  * implementors. The original code is available from http://code.google.com/p/nelly2pcm/
  */
 
 #include "nellymoser.h"
 #include "avcodec.h"
-#include "dsputil.h"
 
-#define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#define BITSTREAM_READER_LE
+#include "get_bits.h"
 
 const float ff_nelly_dequantization_table[127] = {
  0.0000000000,
@@ -223,4 +222,3 @@ void ff_nelly_get_sample_bits(const float *buf, int *bits)
             bits[i] = 0;
     }
 }
-