summaryrefslogtreecommitdiffstats
path: root/libao2/ao_plugin.c
diff options
context:
space:
mode:
authoralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 17:30:15 +0000
committeralex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-12-27 17:30:15 +0000
commit507121f7fe2d170dd8db99d3112602036ddef718 (patch)
tree38b26e115cfadde356b005496286f78307839440 /libao2/ao_plugin.c
parent00f99a82a8f57573e3e6982cf9d014c9b9d8a68b (diff)
downloadmpv-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 'libao2/ao_plugin.c')
-rw-r--r--libao2/ao_plugin.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libao2/ao_plugin.c b/libao2/ao_plugin.c
index 357d338743..0da8959c3e 100644
--- a/libao2/ao_plugin.c
+++ b/libao2/ao_plugin.c
@@ -6,7 +6,7 @@
#include "mp_msg.h"
#include "help_mp.h"
-#include "afmt.h"
+#include "libaf/af_format.h"
#include "audio_out.h"
#include "audio_out_internal.h"
@@ -140,7 +140,7 @@ static int init(int rate,int channels,int format,int flags){
ao_plugin_local_data.format=format;
ao_plugin_local_data.channels=channels;
- ao_plugin_local_data.bpm=audio_out_format_bits(format);
+ ao_plugin_local_data.bpm=af_fmt2bits(format);
ao_plugin_data.rate=rate;
ao_plugin_data.channels=channels;
@@ -168,7 +168,7 @@ static int init(int rate,int channels,int format,int flags){
// Calculate bps
ao_plugin_local_data.bps=(float)(ao_plugin_data.rate *
ao_plugin_data.channels);
- ao_plugin_local_data.bps*=audio_out_format_bits(ao_plugin_data.format)/8;
+ ao_plugin_local_data.bps*=af_fmt2bits(ao_plugin_data.format)/8;
// This should never happen but check anyway
if(NULL==ao_plugin_local_data.driver)