Mercurial > mplayer.hg

comparison libmpdemux/demuxer.c @ 14245:815f03b7cee5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removing AFMT_ dependancy
author alex
date Mon, 27 Dec 2004 17:30:15 +0000
parents 2ae224195625
children fa80ed52127b
comparison
equal deleted inserted replaced
14244:9b03ad0254ae 14245:815f03b7cee5
16 #include "stream.h" 16 #include "stream.h"
17 #include "demuxer.h" 17 #include "demuxer.h"
18 #include "stheader.h" 18 #include "stheader.h"
19 #include "mf.h" 19 #include "mf.h"
20 20
21 #include "../libao2/afmt.h" 21 #include "../libaf/af_format.h"
22 #include "../libvo/fastmemcpy.h" 22 #include "../libvo/fastmemcpy.h"
23 23
24 // Should be set to 1 by demux module if ids it passes to new_sh_audio and 24 // Should be set to 1 by demux module if ids it passes to new_sh_audio and
25 // new_sh_video don't match aids and vids it accepts from the command line 25 // new_sh_video don't match aids and vids it accepts from the command line
26 int demux_aid_vid_mismatch = 0; 26 int demux_aid_vid_mismatch = 0;
89 demuxer->a_streams[id]=malloc(sizeof(sh_audio_t)); 89 demuxer->a_streams[id]=malloc(sizeof(sh_audio_t));
90 memset(demuxer->a_streams[id],0,sizeof(sh_audio_t)); 90 memset(demuxer->a_streams[id],0,sizeof(sh_audio_t));
91 sh = demuxer->a_streams[id]; 91 sh = demuxer->a_streams[id];
92 // set some defaults 92 // set some defaults
93 sh->samplesize=2; 93 sh->samplesize=2;
94 sh->sample_format=AFMT_S16_NE; 94 sh->sample_format=AF_FORMAT_S16_NE;
95 sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/ 95 sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/
96 if (identify && !demux_aid_vid_mismatch) 96 if (identify && !demux_aid_vid_mismatch)
97 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", id); 97 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", id);
98 } 98 }
99 return demuxer->a_streams[id]; 99 return demuxer->a_streams[id];