[Mplayer-cvslog] CVS: main mplayer.c,1.76,1.77

[GEREOFFY]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv30068

Modified Files:
	mplayer.c 
Log Message:
MPEG-ES segfault fixed, stream list printfs moved v 1->0

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -r1.76 -r1.77
*** mplayer.c	2001/04/17 22:59:25	1.76
--- mplayer.c	2001/04/18 01:55:18	1.77
***************
*** 264,268 ****
          printf("Warning! Audio stream header %d redefined!\n",id);
      } else {
!         if(verbose) printf("Found audio stream: %d\n",id);
          avi_header.a_streams[id]=malloc(sizeof(sh_audio_t));
          memset(avi_header.a_streams[id],0,sizeof(sh_audio_t));
--- 264,268 ----
          printf("Warning! Audio stream header %d redefined!\n",id);
      } else {
!         printf("==> Found audio stream: %d\n",id);
          avi_header.a_streams[id]=malloc(sizeof(sh_audio_t));
          memset(avi_header.a_streams[id],0,sizeof(sh_audio_t));
***************
*** 275,279 ****
          printf("Warning! video stream header %d redefined!\n",id);
      } else {
!         if(verbose) printf("Found video stream: %d\n",id);
          avi_header.v_streams[id]=malloc(sizeof(sh_video_t));
          memset(avi_header.v_streams[id],0,sizeof(sh_video_t));
--- 275,279 ----
          printf("Warning! video stream header %d redefined!\n",id);
      } else {
!         printf("==> Found video stream: %d\n",id);
          avi_header.v_streams[id]=malloc(sizeof(sh_video_t));
          memset(avi_header.v_streams[id],0,sizeof(sh_video_t));
***************
*** 826,830 ****
   case DEMUXER_TYPE_MPEG_ES: {
     d_audio->type=0;
!    has_audio=0;sh_audio=NULL; // ES streams has no audio channel
     break;
   }
--- 826,831 ----
   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(0); // create dummy video stream header, id=0
     break;
   }


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog