Mercurial > mplayer.hg

comparison libmpdemux/demux_lavf.c @ 16000:cc9662daeccf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
LIBAVFORMAT_BUILD >= 4629
author michael
date Sun, 17 Jul 2005 23:54:48 +0000
parents dd23cdecf060
children a1fd1a7eeb35
comparison
equal deleted inserted replaced
15999:66dd632593f1 16000:cc9662daeccf
171 // if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track ); 171 // if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track );
172 if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre ); 172 if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre );
173 173
174 for(i=0; i<avfc->nb_streams; i++){ 174 for(i=0; i<avfc->nb_streams; i++){
175 AVStream *st= avfc->streams[i]; 175 AVStream *st= avfc->streams[i];
176 #if LIBAVFORMAT_BUILD >= 4629
177 AVCodecContext *codec= st->codec;
178 #else
176 AVCodecContext *codec= &st->codec; 179 AVCodecContext *codec= &st->codec;
180 #endif
177 181
178 switch(codec->codec_type){ 182 switch(codec->codec_type){
179 case CODEC_TYPE_AUDIO:{ 183 case CODEC_TYPE_AUDIO:{
180 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); 184 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1);
181 sh_audio_t* sh_audio=new_sh_audio(demuxer, i); 185 sh_audio_t* sh_audio=new_sh_audio(demuxer, i);