diff options
author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-27 17:30:15 +0000 |
---|---|---|
committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-12-27 17:30:15 +0000 |
commit | 507121f7fe2d170dd8db99d3112602036ddef718 (patch) | |
tree | 38b26e115cfadde356b005496286f78307839440 /mencoder.c | |
parent | 00f99a82a8f57573e3e6982cf9d014c9b9d8a68b (diff) | |
download | mpv-507121f7fe2d170dd8db99d3112602036ddef718.tar.bz2 mpv-507121f7fe2d170dd8db99d3112602036ddef718.tar.xz |
removing AFMT_ dependancy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14246 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
-rw-r--r-- | mencoder.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/mencoder.c b/mencoder.c index fe160afce1..6a5468823b 100644 --- a/mencoder.c +++ b/mencoder.c @@ -54,7 +54,7 @@ #include "libvo/video_out.h" -#include "libao2/afmt.h" +#include "libaf/af_format.h" #include "libmpcodecs/mp_image.h" #include "libmpcodecs/dec_audio.h" @@ -809,7 +809,7 @@ case ACODEC_PCM: sh_audio->samplerate, sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize, mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, - (mux_a->wf->wBitsPerSample==8)? AFMT_U8:AFMT_S16_LE, + (mux_a->wf->wBitsPerSample==8)? AF_FORMAT_U8:AF_FORMAT_S16_LE, mux_a->wf->wBitsPerSample/8, 16384, mux_a->wf->nAvgBytesPerSec)){ mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); @@ -842,11 +842,7 @@ case ACODEC_VBRMP3: sh_audio->samplerate, sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize, mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, -#ifdef WORDS_BIGENDIAN - AFMT_S16_BE, 2, -#else - AFMT_S16_LE, 2, -#endif + AF_FORMAT_S16_NE, 2, 4608, mux_a->h.dwRate*mux_a->wf->nChannels*2)){ mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_NoMatchingFilter); } @@ -983,7 +979,7 @@ case ACODEC_LAVC: sh_audio->samplerate, sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize, mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, - AFMT_S16_NE, 2, + AF_FORMAT_S16_NE, 2, mux_a->h.dwSuggestedBufferSize, mux_a->h.dwSuggestedBufferSize*2)) { mp_msg(MSGT_CPLAYER, MSGL_ERR, MSGTR_NoMatchingFilter); @@ -1048,7 +1044,7 @@ case ACODEC_TOOLAME: sh_audio->samplerate, sh_audio->channels, sh_audio->sample_format, sh_audio->samplesize, mux_a->wf->nSamplesPerSec, mux_a->wf->nChannels, - AFMT_S16_NE, 2, + AF_FORMAT_S16_NE, 2, mux_a->h.dwSuggestedBufferSize, mux_a->h.dwSuggestedBufferSize*2)) { mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't find matching filter / ao format!\n"); |