RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

removed #ifdefs that are already handled by libao2/afmt.h 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12477 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-05-14 21:16:00 +00:00
parent 7c496e41ee
commit 1499a0df6f
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libao2/afmt.c
View File

@ -30,18 +30,10 @@ char *audio_out_format_name(int format)
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 @@ int audio_out_format_bits(int format){
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;

6
libmpcodecs/dec_audio.c
View File

@ -59,11 +59,7 @@ int init_audio_codec(sh_audio_t *sh_audio)
// 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)