d_audio->type stuff fixed

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1331 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 0 insertions, 4 deletions

diff --git a/mplayer.c b/mplayer.c
index ec4504d756..433f62249c 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -714,9 +714,6 @@ if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
   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 @@ switch(file_format){
   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;