diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-21 20:34:47 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-09-21 20:34:47 +0000 |
| commit | 393924ff39b792c16d7a04b8fba1f73aaec97c42 (patch) | |
| tree | dadcaf1c13098296999f9b6dc653cf3b6c5da82a /libmpcodecs/ad_faad.c | |
| parent | db4e77d0a5e33da13927d805f69c870082d26ee4 (diff) | |
| download | mpv-393924ff39b792c16d7a04b8fba1f73aaec97c42.tar.bz2 mpv-393924ff39b792c16d7a04b8fba1f73aaec97c42.tar.xz | |
setting samplesize to 2 in decoders where neccessary.
Needed because initialization of sh_audio was moved from dec_audio to
demuxer.c, and some demuxers set samplesize incorrect or to 0.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13428 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ad_faad.c')
| -rw-r--r-- | libmpcodecs/ad_faad.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/ad_faad.c b/libmpcodecs/ad_faad.c index bcdd397d7d..bb82c87921 100644 --- a/libmpcodecs/ad_faad.c +++ b/libmpcodecs/ad_faad.c @@ -71,11 +71,11 @@ static int init(sh_audio_t *sh) /* XXX: FAAD support FLOAT output, how do we handle * that (FAAD_FMT_FLOAT)? ::atmos */ - if(sh->samplesize) switch(sh->samplesize){ case 1: // 8Bit mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: 8Bit samplesize not supported by FAAD, assuming 16Bit!\n"); default: + sh->samplesize=2; case 2: // 16Bit faac_conf->outputFormat = FAAD_FMT_16BIT; break; @@ -123,6 +123,7 @@ static int init(sh_audio_t *sh) mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Negotiated samplerate: %dHz channels: %d\n", faac_samplerate, faac_channels); sh->channels = faac_channels; sh->samplerate = faac_samplerate; + sh->samplesize=2; //sh->o_bps = sh->samplesize*faac_channels*faac_samplerate; if(!sh->i_bps) { mp_msg(MSGT_DECAUDIO,MSGL_WARN,"FAAD: compressed input bitrate missing, assuming 128kbit/s!\n"); |