diff options
author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-10 13:57:26 +0200 |
---|---|---|
committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-10 13:57:26 +0200 |
commit | 2de490e2847edaaa11e1ac1baefc5bcd6ebac2fb (patch) | |
tree | c05827bc158adc45643931ee81c9f1b83797ecf3 /src/combined/combined_wavpack.h | |
parent | dcd884f37b2e3ff9f4607b90c117cad610ba4861 (diff) | |
download | xine-lib-2de490e2847edaaa11e1ac1baefc5bcd6ebac2fb.tar.gz xine-lib-2de490e2847edaaa11e1ac1baefc5bcd6ebac2fb.tar.bz2 |
Rationalise __attribute__((packed)) usage.
First of all, as we check the presence of the attribute in configure.ac and
we generate the XINE_PACKED definition there, there's no need to do the work
again on attributes.h.
Also remove #pragma pack support for now, as the trick is just not neat enough,
and as it is it's just noise.
Make Wine, libdvdnav and nosefart use XINE_PACKED rather than doing their own
checks, as they are less reliable.
Diffstat (limited to 'src/combined/combined_wavpack.h')
-rw-r--r-- | src/combined/combined_wavpack.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/combined/combined_wavpack.h b/src/combined/combined_wavpack.h index aa57820b5..7688f91df 100644 --- a/src/combined/combined_wavpack.h +++ b/src/combined/combined_wavpack.h @@ -23,6 +23,7 @@ */ #include "os_types.h" +#include "bswap.h" typedef struct { uint32_t idcode; /* This should always be the string "wvpk" */ @@ -37,9 +38,9 @@ typedef struct { uint32_t samples_count; /* Count of samples in the current frame */ uint32_t flags; /* Misc flags */ uint32_t decoded_crc32; /* CRC32 of the decoded data */ -} __attribute__((packed)) wvheader_t; +} XINE_PACKED wvheader_t; -static const uint32_t wvpk_signature = ME_FOURCC('w', 'v', 'p', 'k') +static const uint32_t wvpk_signature = ME_FOURCC('w', 'v', 'p', 'k'); void *demux_wv_init_plugin (xine_t *const xine, void *const data); void *decoder_wavpack_init_plugin (xine_t *xine, void *data); |