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 /libmpcodecs/ad_dvdpcm.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 'libmpcodecs/ad_dvdpcm.c')
| -rw-r--r-- | libmpcodecs/ad_dvdpcm.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/libmpcodecs/ad_dvdpcm.c b/libmpcodecs/ad_dvdpcm.c index acfbc7855a..1962594961 100644 --- a/libmpcodecs/ad_dvdpcm.c +++ b/libmpcodecs/ad_dvdpcm.c @@ -6,7 +6,6 @@ #include "mp_msg.h" #include "help_mp.h" #include "ad_internal.h" -#include "../libaf/af_format.h" static ad_info_t info = { @@ -35,26 +34,25 @@ static int init(sh_audio_t *sh) } switch ((h >> 6) & 3) { case 0: - sh->sample_format = AFMT_S16_BE; + sh->sample_format = AF_FORMAT_S16_BE; sh->samplesize = 2; break; case 1: mp_msg(MSGT_DECAUDIO, MSGL_INFO, MSGTR_SamplesWanted); sh->i_bps = sh->channels * sh->samplerate * 5 / 2; case 2: - sh->sample_format = AFMT_AF_FLAGS | AF_FORMAT_I | - AF_FORMAT_BE | AF_FORMAT_SI; + sh->sample_format = AF_FORMAT_S24_BE; sh->samplesize = 3; break; default: - sh->sample_format = AFMT_S16_BE; + sh->sample_format = AF_FORMAT_S16_BE; sh->samplesize = 2; } } else { // use defaults: sh->channels=2; sh->samplerate=48000; - sh->sample_format = AFMT_S16_BE; + sh->sample_format = AF_FORMAT_S16_BE; sh->samplesize = 2; } if (!sh->i_bps) |