Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / nellymoser.c

diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c
index 79c367a455d5ff21dd5b5ea210522ad07543fb5f..cbcc4f941bc6a2f2cbdc8e9e76f6684c0185fdd6 100644 (file)
--- a/libavcodec/nellymoser.c
+++ b/libavcodec/nellymoser.c
@@ -26,18 +26,17 @@
  */
 
 /**
- * @file 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 "libavutil/random.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,