RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-01 23:00:41 +00:00
Code Issues Releases Wiki Activity

Simplify/make new_sh behaviour more consistent when a stream gets redefined.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26907 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2008-05-27 17:33:13 +00:00
parent fba4b13c9b
commit ff6007357f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libmpdemux/demuxer.c
View File

@ -268,6 +268,7 @@ sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid){
sh_audio_t *sh = calloc(1, sizeof(sh_audio_t));
mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundAudioStream,id);
demuxer->a_streams[id] = sh;
sh->aid = aid;
// set some defaults
sh->samplesize=2;
sh->sample_format=AF_FORMAT_S16_NE;
@ -275,7 +276,6 @@ sh_audio_t* new_sh_audio_aid(demuxer_t *demuxer,int id,int aid){
sh->pts=MP_NOPTS_VALUE;
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid);
}
((sh_audio_t *)demuxer->a_streams[id])->aid = aid;
return demuxer->a_streams[id];
}
@ -299,11 +299,12 @@ sh_video_t* new_sh_video_vid(demuxer_t *demuxer,int id,int vid){
if(demuxer->v_streams[id]){
mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_VideoStreamRedefined,id);
} else {
sh_video_t *sh = calloc(1, sizeof(sh_video_t));
mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundVideoStream,id);
demuxer->v_streams[id]=calloc(1, sizeof(sh_video_t));
demuxer->v_streams[id] = sh;
sh->vid = vid;
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid);
}
((sh_video_t *)demuxer->v_streams[id])->vid = vid;
return demuxer->v_streams[id];
}