diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-13 22:20:44 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-13 22:20:44 +0100 |
| commit | 42d23a86ff422f650b16ec786f5e96b126ec680a (patch) | |
| tree | 991158f109e0ac97adbe7510529e535fc06234f4 /src/libxineadec | |
| parent | 44234828cf17a0a302975dc3f5f8b671f86a8ac2 (diff) | |
| parent | fc2fa145300536b0a19f878212912e9b2d5b57a1 (diff) | |
| download | xine-lib-42d23a86ff422f650b16ec786f5e96b126ec680a.tar.gz xine-lib-42d23a86ff422f650b16ec786f5e96b126ec680a.tar.bz2 | |
Merge changes from 1.2 main.last-internal-ffmpeg
Diffstat (limited to 'src/libxineadec')
| -rw-r--r-- | src/libxineadec/xine_faad_decoder.c | 4 | ||||
| -rw-r--r-- | src/libxineadec/xine_musepack_decoder.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c index 36d1d0679..c12e7816d 100644 --- a/src/libxineadec/xine_faad_decoder.c +++ b/src/libxineadec/xine_faad_decoder.c @@ -72,7 +72,7 @@ typedef struct faad_decoder_s { unsigned char *dec_config; int dec_config_size; - uint32_t rate; + unsigned long rate; int bits_per_sample; unsigned char num_channels; int sbr; @@ -199,6 +199,8 @@ static int faad_open_output( faad_decoder_t *this ) { case 2: ao_cap_mode=AO_CAP_MODE_STEREO; break; + default: + return 0; } this->output_open = (this->stream->audio_out->open) (this->stream->audio_out, diff --git a/src/libxineadec/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c index ad5002439..d23d1546c 100644 --- a/src/libxineadec/xine_musepack_decoder.c +++ b/src/libxineadec/xine_musepack_decoder.c @@ -129,7 +129,7 @@ static int32_t mpc_reader_tell(void *const data) { /* Returns the total length of the source stream, in bytes. */ static int32_t mpc_reader_get_size(void *const data) { - mpc_decoder_t *const this = (const mpc_decoder_t *) data; + mpc_decoder_t *const this = (mpc_decoder_t *) data; lprintf("mpc_reader_get_size\n"); |