← Back to branch summary

~ubuntu-branches/debian/sid/mame/sid

« back to all changes in this revision

Viewing changes to src/lib/libflac/libflac/bitreader.c

  • Committer: Package Import Robot
  • Author(s): Jordi Mallach, Emmanuel Kasper, Jordi Mallach
  • Date: 2012-06-05 20:02:23 UTC
  • mfrom: (0.3.1) (0.1.4)
  • Revision ID: package-import@ubuntu.com-20120605200223-gnlpogjrg6oqe9md
Tags: 0.146-1
[ Emmanuel Kasper ]
* New upstream release
* Drop patch to fix man pages section and patches to link with flac 
  and jpeg system lib: all this has been pushed upstream by Cesare Falco
* Add DM-Upload-Allowed: yes field.

[ Jordi Mallach ]
* Create a "gnu" TARGETOS stanza that defines NO_AFFINITY_NP.
* Stop setting TARGETOS to "unix" in d/rules. It should be autodetected,
  and set to the appropriate value.
* mame_manpage_section.patch: Change mame's manpage section to 6 (games),
  in the TH declaration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lib/libflac/libflac/bitreader.c
143
143
};
144
144
 
145
145
 
 
146
#if !WORDS_BIGENDIAN
146
147
static FLAC__uint32 local_swap32_(FLAC__uint32 x)
147
148
{
148
149
        x = ((x<<8)&0xFF00FF00) | ((x>>8)&0x00FF00FF);
149
150
        return (x>>16) | (x<<16);
150
151
}
 
152
#endif
151
153
 
152
 
#ifdef _MSC_VER
 
154
#if defined(_MSC_VER) && defined(_M_IX86)
153
155
/* OPT: an MSVC built-in would be better */
154
156
static void local_swap32_block_(FLAC__uint32 *start, FLAC__uint32 len)
155
157
{
258
260
#if WORDS_BIGENDIAN
259
261
#else
260
262
        end = (br->words*FLAC__BYTES_PER_WORD + br->bytes + bytes + (FLAC__BYTES_PER_WORD-1)) / FLAC__BYTES_PER_WORD;
261
 
# if defined(_MSC_VER) && (FLAC__BYTES_PER_WORD == 4)
 
263
# if defined(_MSC_VER) && (FLAC__BYTES_PER_WORD == 4) && defined(_M_IX86)
262
264
        if(br->cpu_info.type == FLAC__CPUINFO_TYPE_IA32 && br->cpu_info.data.ia32.bswap) {
263
265
                start = br->words;
264
266
                local_swap32_block_(br->buffer + start, end - start);