Merge d7a161d9..2ffaf92c from libsndfile-cart.

This commit is contained in:
Erik de Castro Lopo 2013-02-11 20:13:35 +11:00
parent 2ffaf92cb6
commit 6890818772
2 changed files with 8 additions and 3 deletions

View File

@ -3,6 +3,11 @@
* src/ALAC/
Replace Apple endswap routines with ones from libsndfile.
* merge from libsndfile-cart repo
Add ability to set and get a cart chunk with WAV and RF64.
Orignal patch by Chris Roberts <c.roberts@csrfm.com> required a number of
tweaks.
2013-02-10 Erik de Castro Lopo <erikd AT mega-nerd DOT com>
* src/common.h

View File

@ -229,7 +229,7 @@ static int
alac_reader_init (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info)
{ ALAC_PRIVATE *plac ;
uint32_t kuki_size ;
uint8_t kuki [512] ;
union { uint8_t kuki [512] ; uint32_t alignment ; } u ;
if (info == NULL)
{ psf_log_printf (psf, "%s : ALAC_DECODER_INFO is NULL.\n", __func__) ;
@ -253,9 +253,9 @@ alac_reader_init (SF_PRIVATE *psf, const ALAC_DECODER_INFO * info)
} ;
/* Read in the ALAC cookie data and pass it to the init function. */
kuki_size = alac_kuki_read (psf, info->kuki_offset, kuki, sizeof (kuki)) ;
kuki_size = alac_kuki_read (psf, info->kuki_offset, u.kuki, sizeof (u.kuki)) ;
alac_decoder_init (&plac->decoder, kuki, kuki_size) ;
alac_decoder_init (&plac->decoder, u.kuki, kuki_size) ;
switch (info->bits_per_sample)
{ case 16 :