Mercurial > mplayer.hg
changeset 12476:131b6c682863
removed #ifdefs that are already handled by libao2/afmt.h
| author | reimar |
|---|---|
| date | Fri, 14 May 2004 21:16:00 +0000 |
| parents | 16e673350486 |
| children | 1550ef7117c4 |
| files | libao2/afmt.c libmpcodecs/dec_audio.c |
| diffstat | 2 files changed, 1 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/afmt.c Fri May 14 21:08:53 2004 +0000 +++ b/libao2/afmt.c Fri May 14 21:16:00 2004 +0000 @@ -30,18 +30,10 @@ return("MPEG (2) audio"); case AFMT_AC3: return("AC3"); -/* - the following two formats are not available with old linux kernel - headers (e.g. in 2.2.16) -*/ -#ifdef AFMT_S32_LE case AFMT_S32_LE: return("Signed 32-bit (Little-Endian)"); -#endif -#ifdef AFMT_S32_BE case AFMT_S32_BE: return("Signed 32-bit (Big-Endian)"); -#endif case AFMT_FLOAT: return("Floating Point"); } @@ -58,18 +50,8 @@ case AFMT_U16_BE: return 16;//16 bits -/* - the following two formats are not available with old linux kernel - headers (e.g. in 2.2.16) -*/ -#ifdef AFMT_S32_LE case AFMT_S32_LE: - return 32; -#endif -#ifdef AFMT_S32_BE case AFMT_S32_BE: - return 32; -#endif case AFMT_FLOAT: return 32;
--- a/libmpcodecs/dec_audio.c Fri May 14 21:08:53 2004 +0000 +++ b/libmpcodecs/dec_audio.c Fri May 14 21:16:00 2004 +0000 @@ -59,11 +59,7 @@ // Set up some common usefull defaults. ad->preinit() can override these: sh_audio->samplesize=2; -#ifdef WORDS_BIGENDIAN - sh_audio->sample_format=AFMT_S16_BE; -#else - sh_audio->sample_format=AFMT_S16_LE; -#endif + sh_audio->sample_format=AFMT_S16_NE; sh_audio->samplerate=0; sh_audio->channels=0; sh_audio->i_bps=0; // input rate (bytes/sec)