Mercurial > mplayer.hg
comparison libmpdemux/demux_lavf.c @ 23010:74efb0fa8a0b
with -identify show audio and video id; patch by Andrew Savchenko (Bircoph list ru)
| author | nicodvb |
|---|---|
| date | Fri, 20 Apr 2007 21:49:49 +0000 |
| parents | a76748e71a18 |
| children | 6a40ec31cfa7 |
comparison
equal
deleted
inserted
replaced
| 23009:41d042563508 | 23010:74efb0fa8a0b |
|---|---|
| 21 // #include <unistd.h> | 21 // #include <unistd.h> |
| 22 #include <limits.h> | 22 #include <limits.h> |
| 23 | 23 |
| 24 #include "config.h" | 24 #include "config.h" |
| 25 #include "mp_msg.h" | 25 #include "mp_msg.h" |
| 26 // #include "help_mp.h" | 26 #include "help_mp.h" |
| 27 | 27 |
| 28 #include "stream/stream.h" | 28 #include "stream/stream.h" |
| 29 #include "demuxer.h" | 29 #include "demuxer.h" |
| 30 #include "stheader.h" | 30 #include "stheader.h" |
| 31 #include "m_option.h" | 31 #include "m_option.h" |
| 303 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); | 303 WAVEFORMATEX *wf= calloc(sizeof(WAVEFORMATEX) + codec->extradata_size, 1); |
| 304 sh_audio_t* sh_audio; | 304 sh_audio_t* sh_audio; |
| 305 if(priv->audio_streams >= MAX_A_STREAMS) | 305 if(priv->audio_streams >= MAX_A_STREAMS) |
| 306 break; | 306 break; |
| 307 sh_audio=new_sh_audio(demuxer, i); | 307 sh_audio=new_sh_audio(demuxer, i); |
| 308 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "lavf", i); | |
| 308 if(!sh_audio) | 309 if(!sh_audio) |
| 309 break; | 310 break; |
| 310 priv->astreams[priv->audio_streams] = i; | 311 priv->astreams[priv->audio_streams] = i; |
| 311 priv->audio_streams++; | 312 priv->audio_streams++; |
| 312 // mp4a tag is used for all mp4 files no matter what they actually contain | 313 // mp4a tag is used for all mp4 files no matter what they actually contain |
| 377 sh_video_t* sh_video; | 378 sh_video_t* sh_video; |
| 378 BITMAPINFOHEADER *bih; | 379 BITMAPINFOHEADER *bih; |
| 379 if(priv->video_streams >= MAX_V_STREAMS) | 380 if(priv->video_streams >= MAX_V_STREAMS) |
| 380 break; | 381 break; |
| 381 sh_video=new_sh_video(demuxer, i); | 382 sh_video=new_sh_video(demuxer, i); |
| 383 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_VideoID, "lavf", i); | |
| 382 if(!sh_video) break; | 384 if(!sh_video) break; |
| 383 priv->vstreams[priv->video_streams] = i; | 385 priv->vstreams[priv->video_streams] = i; |
| 384 priv->video_streams++; | 386 priv->video_streams++; |
| 385 bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1); | 387 bih=calloc(sizeof(BITMAPINFOHEADER) + codec->extradata_size,1); |
| 386 | 388 |