comparison mplayer.c @ 500:c2b3a1f340c8

MPEG-ES segfault fixed, stream list printfs moved v 1->0

499:3601edb3805c

sh_audio_t* new_sh_audio(int id){
    if(avi_header.a_streams[id]){
        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));
    }
    return avi_header.a_streams[id];
}

sh_video_t* new_sh_video(int id){
    if(avi_header.v_streams[id]){
        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));
    }
    return avi_header.v_streams[id];
}

    sh_video->bih->biBitCount);
  break;
 }
 case DEMUXER_TYPE_MPEG_ES: {
   d_audio->type=0;
   has_audio=0;sh_audio=NULL; // ES streams has no audio channel
   break;
 }
 case DEMUXER_TYPE_MPEG_PS: {
  if(has_audio)
  if(!ds_fill_buffer(d_audio)){

500:c2b3a1f340c8

sh_audio_t* new_sh_audio(int id){
    if(avi_header.a_streams[id]){
        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));
    }
    return avi_header.a_streams[id];
}

sh_video_t* new_sh_video(int id){
    if(avi_header.v_streams[id]){
        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));
    }
    return avi_header.v_streams[id];
}

    sh_video->bih->biBitCount);
  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(0); // create dummy video stream header, id=0
   break;
 }
 case DEMUXER_TYPE_MPEG_PS: {
  if(has_audio)
  if(!ds_fill_buffer(d_audio)){