~ubuntu-branches/ubuntu/maverick/libmpc/maverick

« back to all changes in this revision

Viewing changes to libmpcdec/streaminfo.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2009-10-20 20:08:39 UTC
  • mfrom: (1.1.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20091020200839-sr97yyqrmahl62a4
Tags: upstream-0.1~r453
Import upstream version 0.1~r453

Show diffs side-by-side

added added

removed removed

Lines of Context:
42
42
#include "huffman.h"
43
43
#include "mpc_bits_reader.h"
44
44
 
45
 
unsigned long crc32(unsigned char *buf, int len);
 
45
unsigned long mpc_crc32(unsigned char *buf, int len);
46
46
 
47
47
static const char na[] = "n.a.";
48
48
static char const * const versionNames[] = {
190
190
        mpc_bits_reader r = *r_in;
191
191
 
192
192
        CRC = (mpc_bits_read(&r, 16) << 16) | mpc_bits_read(&r, 16);
193
 
        if (CRC != crc32(r.buff + 1 - (r.count >> 3), (int)block_size - 4))
 
193
        if (CRC != mpc_crc32(r.buff + 1 - (r.count >> 3), (int)block_size - 4))
194
194
                return MPC_STATUS_FILE;
195
195
 
196
196
        si->stream_version = mpc_bits_read(&r, 8);