Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv30627 Modified Files: dec_audio.c Log Message: fixed AFMT_ stuff (inclue afmt.h) Index: dec_audio.c =================================================================== RCS file: /cvsroot/mplayer/main/dec_audio.c,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** dec_audio.c 2001/06/05 18:40:44 1.16 --- dec_audio.c 2001/06/08 23:30:43 1.17 *************** *** 4,21 **** #include "config.h" - #ifdef USE_OSS_AUDIO - #include <sys/soundcard.h> - #endif - #ifdef USE_SUN_AUDIO - #include <sys/types.h> - #include <sys/audioio.h> - #define AFMT_MU_LAW AUDIO_ENCODING_ULAW - #define AFMT_A_LAW AUDIO_ENCODING_ALAW - #define AFMT_S16_LE AUDIO_ENCODING_LINEAR - #define AFMT_IMA_ADPCM AUDIO_ENCODING_DVI - #define AFMT_U8 AUDIO_ENCODING_LINEAR8 - #endif - extern int verbose; // defined in mplayer.c --- 4,9 ---- #include "config.h" + #include "libao2/afmt.h" extern int verbose; // defined in mplayer.c *************** *** 173,182 **** case 0x6: sh_audio->sample_format=AFMT_A_LAW;break; case 0x7: sh_audio->sample_format=AFMT_MU_LAW;break; - #if !defined(__NetBSD__) case 0x11: sh_audio->sample_format=AFMT_IMA_ADPCM;break; - #endif - #if !defined(__sun) && !defined(__NetBSD__) case 0x50: sh_audio->sample_format=AFMT_MPEG;break; - #endif // case 0x2000: sh_audio->sample_format=AFMT_AC3; default: sh_audio->sample_format=(sh_audio->samplesize==2)?AFMT_S16_LE:AFMT_U8; --- 161,166 ---- *************** *** 279,288 **** case 1: // MPEG layer 2 or 3 len=MP3_DecodeFrame(buf,-1); - sh_audio->channels=2; // hack break; case 2: // AVI PCM ! { len=demux_read_data(sh_audio->ds,buf,minlen); break; - } case 8: // DVD PCM { int j; --- 263,270 ---- case 1: // MPEG layer 2 or 3 len=MP3_DecodeFrame(buf,-1); break; case 2: // AVI PCM ! len=demux_read_data(sh_audio->ds,buf,minlen); break; case 8: // DVD PCM { int j; _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog@lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog