Mercurial > mplayer.hg

diff libmpdemux/demux_real.c @ 36811:92dd1764392a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e4eaa6407e24
children 91b00a4407cd
line wrap: on
line diff
--- a/libmpdemux/demux_real.c	Sun Feb 23 18:02:21 2014 +0000
+++ b/libmpdemux/demux_real.c	Sun Feb 23 18:14:44 2014 +0000
@@ -1077,7 +1077,6 @@
     if(demuxer->audio->id==-1 && demuxer->a_streams[mp_stream_id]){
 	sh_audio_t *sh = demuxer->a_streams[mp_stream_id];
 	demuxer->audio->id=mp_stream_id;
-	sh->ds=demuxer->audio;
 	demuxer->audio->sh=sh;
 	priv->audio_buf = calloc(priv->sub_packet_h[demuxer->audio->id], priv->audiopk_size[demuxer->audio->id]);
 	priv->audio_timestamp = calloc(priv->sub_packet_h[demuxer->audio->id], sizeof(double));
@@ -1088,7 +1087,6 @@
     if(demuxer->video->id==-1 && demuxer->v_streams[mp_stream_id]){
 	sh_video_t *sh = demuxer->v_streams[mp_stream_id];
 	demuxer->video->id=mp_stream_id;
-	sh->ds=demuxer->video;
 	demuxer->video->sh=sh;
         mp_msg(MSGT_DEMUX,MSGL_V,"Auto-selected RM video ID = %d (rm id %d)\n",mp_stream_id, rm_stream_id);
 	goto got_video;
@@ -1510,7 +1508,6 @@
 		    }
 
 		    if(demuxer->audio->id==stream_id){
-			sh->ds=demuxer->audio;
 			demuxer->audio->sh=sh;
         	priv->audio_buf = calloc(priv->sub_packet_h[demuxer->audio->id], priv->audiopk_size[demuxer->audio->id]);
         	priv->audio_timestamp = calloc(priv->sub_packet_h[demuxer->audio->id], sizeof(double));
@@ -1538,7 +1535,6 @@
 		    sh->wf->wFormatTag = sh->format = mmioFOURCC('a','d','u',0x55);
 
 		    if(demuxer->audio->id==stream_id){
-			    sh->ds=demuxer->audio;
 			    demuxer->audio->sh=sh;
 		    }
 
@@ -1684,7 +1680,6 @@
 		    }
 
 		    if(demuxer->video->id==stream_id){
-			sh->ds=demuxer->video;
 			demuxer->video->sh=sh;
 		    }