Mercurial > mplayer.hg

diff libmpdemux/demux_mov.c @ 31609:cd81fce1f010

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make the stream language an argument to the stream creation function so that some code can be shared.
author reimar
date Sat, 10 Jul 2010 18:47:59 +0000
parents a25d16882312
children 52f920e9c540
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c	Sat Jul 10 18:11:05 2010 +0000
+++ b/libmpdemux/demux_mov.c	Sat Jul 10 18:47:59 2010 +0000
@@ -1338,7 +1338,7 @@
 	    mov_build_index(trak,priv->timescale);
 	    switch(trak->type){
 	    case MOV_TRAK_AUDIO: {
-		sh_audio_t* sh=new_sh_audio(demuxer,priv->track_db);
+		sh_audio_t* sh=new_sh_audio(demuxer,priv->track_db, NULL);
 		mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_AudioID, "mov", priv->track_db);
 		gen_sh_audio(sh, trak, priv->timescale);
 		break;
@@ -1353,7 +1353,7 @@
 		if (trak->fourcc == mmioFOURCC('m','p','4','s') ||
 		    trak->fourcc == mmioFOURCC('t','x','3','g') ||
 		    trak->fourcc == mmioFOURCC('t','e','x','t')) {
-			sh_sub_t *sh = new_sh_sub(demuxer, priv->track_db);
+			sh_sub_t *sh = new_sh_sub(demuxer, priv->track_db, NULL);
 			mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_SubtitleID, "mov", priv->track_db);
 			if (trak->fourcc == mmioFOURCC('m','p','4','s'))
 				init_vobsub(sh, trak);