* 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 "libavutil/random.h"
#include "avcodec.h"
-#include "random.h"
#include "dsputil.h"
#define ALT_BITSTREAM_READER_LE
static int sum_bits(short *buf, short shift, short off)
{
- int b, i = 0, ret = 0;
+ int i, ret = 0;
for (i = 0; i < NELLY_FILL_LEN; i++) {
- b = buf[i]-off;
+ int b = buf[i]-off;
b = ((b>>(shift-1))+1)>>1;
ret += av_clip(b, 0, NELLY_BIT_CAP);
}
}
}
-void nelly_decode_block(NellyMoserDecodeContext *s, const unsigned char block[NELLY_BLOCK_LEN], float audio[NELLY_SAMPLES])
+static void nelly_decode_block(NellyMoserDecodeContext *s,
+ const unsigned char block[NELLY_BLOCK_LEN],
+ float audio[NELLY_SAMPLES])
{
int i,j;
float buf[NELLY_FILL_LEN], pows[NELLY_FILL_LEN];
NULL,
decode_end,
decode_tag,
- .long_name = "Nellymoser",
+ .long_name = "Nellymoser Asao",
};