diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-06 21:58:39 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-06 21:58:39 +0000 |
| commit | aedc5fa95bf2a9dc1d5b070fa4472e7fb6764fd3 (patch) | |
| tree | a9330be4d06d76c8705179ee8dc288e23d9e3863 /libmpdemux/demux_mov.c | |
| parent | ae0b0d103335e6b6d3ebbf2b9c6d174629154c2e (diff) | |
| download | mpv-aedc5fa95bf2a9dc1d5b070fa4472e7fb6764fd3.tar.bz2 mpv-aedc5fa95bf2a9dc1d5b070fa4472e7fb6764fd3.tar.xz | |
- always print the longest stream in info, not the selected one
- handle teh case when user forces nonexistant streams (-aid/-vid) (based on
Filip's patch)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8831 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mov.c')
| -rw-r--r-- | libmpdemux/demux_mov.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 99022ff0d0..26d2cfe98d 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -1459,26 +1459,36 @@ int mov_read_header(demuxer_t* demuxer){ for(t_no=0;t_no<priv->track_db;t_no++){ mov_track_t* trak=priv->tracks[t_no]; int len=(trak->samplesize) ? trak->chunks_size : trak->samples_size; - if(demuxer->audio->id==-1 && demuxer->a_streams[t_no]){ // need audio + if(demuxer->a_streams[t_no]){ // need audio if(len>best_a_len){ best_a_len=len; best_a_id=t_no; } } - if(demuxer->video->id==-1 && demuxer->v_streams[t_no]){ // need video + if(demuxer->v_streams[t_no]){ // need video if(len>best_v_len){ best_v_len=len; best_v_id=t_no; } } } - mp_msg(MSGT_DEMUX, MSGL_INFO, "MOV: best streams: A: #%d (%d samples) V: #%d (%d samples)\n", + mp_msg(MSGT_DEMUX, MSGL_INFO, "MOV: longest streams: A: #%d (%d samples) V: #%d (%d samples)\n", best_a_id,best_a_len,best_v_id,best_v_len); - if(best_a_id>=0) demuxer->audio->id=best_a_id; - if(best_v_id>=0) demuxer->video->id=best_v_id; + if(demuxer->audio->id==-1 && best_a_id>=0) demuxer->audio->id=best_a_id; + if(demuxer->video->id==-1 && best_v_id>=0) demuxer->video->id=best_v_id; // setup sh pointers: if(demuxer->audio->id>=0){ sh_audio_t* sh=demuxer->a_streams[demuxer->audio->id]; - demuxer->audio->sh=sh; sh->ds=demuxer->audio; + if(sh){ + demuxer->audio->sh=sh; sh->ds=demuxer->audio; + } else { + mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected audio stream (%d) does not exists\n",demuxer->audio->id); + demuxer->audio->id=-2; + } } if(demuxer->video->id>=0){ sh_video_t* sh=demuxer->v_streams[demuxer->video->id]; - demuxer->video->sh=sh; sh->ds=demuxer->video; + if(sh){ + demuxer->video->sh=sh; sh->ds=demuxer->video; + } else { + mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected video stream (%d) does not exists\n",demuxer->video->id); + demuxer->video->id=-2; + } } #if 1 |