[MPlayer-dev-eng] [Patch] ogg stream selection via -aid and -vid

[Alexander Werth (gmx)]

Hy,
I attached a minor patch to enable the selection of audio and video
streams of ogg media files in mplayer and mencoder.
btw, what is still missing is a subtitle demuxer.
Alexander Werth

-- 
OpenOffice 1.0.0  Evolution 1.0.4  Nautilus 1.1.14  Galeon 1.2.1
Gimp 1.2.3  Gnome 1.4  mplayer 0.90pre4     We are almost there.
-------------- next part --------------
--- ../main.bak3/libmpdemux/demux_ogg.c	Sat Apr 20 19:50:11 2002
+++ libmpdemux/demux_ogg.c	Sun May 19 16:10:35 2002
@@ -521,23 +521,23 @@
 	// If the audio stream is not defined we took the first one
 	if(demuxer->audio->id == -1) {
 	  demuxer->audio->id = ogg_d->num_sub;
-	  demuxer->audio->sh = sh_a;
-	  sh_a->ds = demuxer->audio;
 //	  if(sh_a->wf) print_wave_header(sh_a->wf);
 	}
 	/// Is it the stream we want
 	if(demuxer->audio->id == ogg_d->num_sub)
+	  demuxer->audio->sh = sh_a;
+	  sh_a->ds = demuxer->audio;
 	  ds = demuxer->audio;
       }
       if(sh_v) {
 	/// Also for video
 	if(demuxer->video->id == -1) {
 	  demuxer->video->id = ogg_d->num_sub;
-	  demuxer->video->sh = sh_v;
-	  sh_v->ds = demuxer->video;
 //	  if(sh_v->bih) print_video_header(sh_v->bih);
 	}
 	if(demuxer->video->id == ogg_d->num_sub)
+	  demuxer->video->sh = sh_v;
+	  sh_v->ds = demuxer->video;
 	  ds = demuxer->video;
       }
       /// Add the header packets if the stream isn't seekable