diff libmpdemux/demux_mov.c @ 36811:92dd1764392a

demuxers: remove pointless sh->ds assignments. The new_sh_* functions have been fixed a long time ago to do this.
author reimar
date Sun, 23 Feb 2014 18:14:44 +0000
parents 689594b793f7
children
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c	Sun Feb 23 18:02:21 2014 +0000
+++ b/libmpdemux/demux_mov.c	Sun Feb 23 18:14:44 2014 +0000
@@ -944,7 +944,7 @@
 //		if(demuxer->audio->id==-1 || demuxer->audio->id==priv->track_db){
 //		    // (auto)selected audio track:
 //		    demuxer->audio->id=priv->track_db;
-//		    demuxer->audio->sh=sh; sh->ds=demuxer->audio;
+//		    demuxer->audio->sh=sh;
 //		}
     return 1;
 }
@@ -1277,7 +1277,7 @@
 //		if(demuxer->video->id==-1 || demuxer->video->id==priv->track_db){
 //		    // (auto)selected video track:
 //		    demuxer->video->id=priv->track_db;
-//		    demuxer->video->sh=sh; sh->ds=demuxer->video;
+//		    demuxer->video->sh=sh;
 //		}
     return 1;
 }
@@ -1981,7 +1981,7 @@
     if(demuxer->audio->id>=0){
 	sh_audio_t* sh=demuxer->a_streams[demuxer->audio->id];
 	if(sh){
-	    demuxer->audio->sh=sh; sh->ds=demuxer->audio;
+	    demuxer->audio->sh=sh;
 	} else {
 	    mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected audio stream (%d) does not exist\n",demuxer->audio->id);
 	    demuxer->audio->id=-2;
@@ -1990,7 +1990,7 @@
     if(demuxer->video->id>=0){
 	sh_video_t* sh=demuxer->v_streams[demuxer->video->id];
 	if(sh){
-	    demuxer->video->sh=sh; sh->ds=demuxer->video;
+	    demuxer->video->sh=sh;
 	} else {
 	    mp_msg(MSGT_DEMUX, MSGL_ERR, "MOV: selected video stream (%d) does not exist\n",demuxer->video->id);
 	    demuxer->video->id=-2;