[Mplayer-cvslog] CVS: main mplayer.c,1.180,1.181 demuxer.h,1.6,1.7

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv10643

Modified Files:
	mplayer.c demuxer.h 
Log Message:
d_audio->type stuff fixed

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -r1.180 -r1.181
--- mplayer.c	16 Jul 2001 12:53:48 -0000	1.180
+++ mplayer.c	16 Jul 2001 15:09:34 -0000	1.181
@@ -714,9 +714,6 @@
   stream_reset(stream);
   demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id);
   stream_seek(demuxer->stream,seek_to_byte);
-  // Arpi? why is this extra and not in codec selection? - atmos ::
-  // Hmm. This should be fixed somehow... I'll check diz later. - arpi
-  if(audio_family!=-1) demuxer->audio->type=audio_family; // override audio format
   if(ds_fill_buffer(demuxer->video)){
     printf("Detected MPEG-PS file format!\n");
     file_format=DEMUXER_TYPE_MPEG_PS;
@@ -903,7 +900,6 @@
   break;
  }
  case DEMUXER_TYPE_MPEG_ES: {
-   d_audio->type=0;
    has_audio=0;sh_audio=NULL;   // ES streams has no audio channel
    d_video->sh=new_sh_video(demuxer,0); // create dummy video stream header, id=0
    break;

Index: demuxer.h
===================================================================
RCS file: /cvsroot/mplayer/main/demuxer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demuxer.h	12 Jul 2001 15:35:51 -0000	1.6
+++ demuxer.h	16 Jul 2001 15:09:34 -0000	1.7
@@ -44,7 +44,7 @@
   demux_packet_t *first;  // read to current buffer from here
   demux_packet_t *last;   // append new packets from input stream to here
   int id;                 // stream ID  (for multiple audio/video streams)
-  int type;               // stream type (currently used only for audio)
+  int type;               // stream type (currently used only for mpg-PS audio)
   struct demuxer_st *demuxer; // parent demuxer structure (stream handler)
 // ---- asf -----
   demux_packet_t *asf_packet;  // read asf fragments here