Mercurial > mplayer.hg

diff mplayer.c @ 1330:8940480b3856

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
d_audio->type stuff fixed
author arpi
date Mon, 16 Jul 2001 15:09:34 +0000
parents b12e1817bcc2
children b4457de47804
line wrap: on
line diff
--- a/mplayer.c	Mon Jul 16 13:34:42 2001 +0000
+++ b/mplayer.c	Mon Jul 16 15:09:34 2001 +0000
@@ -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;