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 /libao2/ao_mpegpes.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 'libao2/ao_mpegpes.c')
-rw-r--r-- | libao2/ao_mpegpes.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libao2/ao_mpegpes.c b/libao2/ao_mpegpes.c index be9ad4a7f2..925d78b609 100644 --- a/libao2/ao_mpegpes.c +++ b/libao2/ao_mpegpes.c @@ -15,7 +15,7 @@ #include "audio_out.h" #include "audio_out_internal.h" -#include "afmt.h" +#include "libaf/af_format.h" #include "mp_msg.h" #include "help_mp.h" @@ -96,14 +96,14 @@ static int init(int rate,int channels,int format,int flags){ ao_data.channels=2; ao_data.outburst=2000; switch(format){ - case AFMT_S16_LE: - case AFMT_S16_BE: - case AFMT_MPEG: - case AFMT_AC3: + case AF_FORMAT_S16_LE: + case AF_FORMAT_S16_BE: + case AF_FORMAT_MPEG2: + case AF_FORMAT_AC3: ao_data.format=format; break; default: - ao_data.format=AFMT_S16_BE; + ao_data.format=AF_FORMAT_S16_BE; } retry: @@ -174,14 +174,14 @@ static int get_space(){ // return: number of bytes played static int play(void* data,int len,int flags){ // printf("\nao_mpegpes: play(%d) freq=%d\n",len,freq_id); - if(ao_data.format==AFMT_MPEG) + if(ao_data.format==AF_FORMAT_MPEG2) send_pes_packet(data,len,0x1C0,ao_data.pts); else { int i; unsigned short *s=data; // if(len>2000) len=2000; // printf("ao_mpegpes: len=%d \n",len); - if(ao_data.format==AFMT_S16_LE || ao_data.format==AFMT_AC3) + if(ao_data.format==AF_FORMAT_S16_LE || ao_data.format==AF_FORMAT_AC3) for(i=0;i<len/2;i++) s[i]=(s[i]>>8)|(s[i]<<8); // le<->be send_lpcm_packet(data,len,0xA0,ao_data.pts,freq_id); } |