ffmpeg, ffprobe: don't "merge" side data into packet data by default

[ffmpeg] / libavcodec / nellymoser.c

diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c
index cbcc4f941bc6a2f2cbdc8e9e76f6684c0185fdd6..027726e0ba657b44662066ce849a38f6ebfa18ee 100644 (file)
--- a/libavcodec/nellymoser.c
+++ b/libavcodec/nellymoser.c
@@ -31,12 +31,10 @@
  * implementors. The original code is available from http://code.google.com/p/nelly2pcm/
  */
 
-#include "nellymoser.h"
-#include "avcodec.h"
-#include "dsputil.h"
+#include "libavutil/common.h"
 
-#define BITSTREAM_READER_LE
-#include "get_bits.h"
+#include "avcodec.h"
+#include "nellymoser.h"
 
 const float ff_nelly_dequantization_table[127] = {
  0.0000000000,
@@ -223,4 +221,3 @@ void ff_nelly_get_sample_bits(const float *buf, int *bits)
             bits[i] = 0;
     }
 }
-