comparison libmpdemux/demuxer.c @ 14666:91bbfcb66883

Memleak fixes. Based on patch by Timothy Lee (timothy lee at siriushk com).

14665:e07e06c06932

#ifdef STREAMING_LIVE_DOT_COM
    case DEMUXER_TYPE_RTP:
      demux_close_rtp(demuxer); break;
#endif
    case DEMUXER_TYPE_SMJPEG:
      demux_close_smjpeg(demuxer); return;
    case DEMUXER_TYPE_DEMUXERS:
      demux_close_demuxers(demuxer); return;
    case DEMUXER_TYPE_AVI: 
    case DEMUXER_TYPE_AVI_NI:
    case DEMUXER_TYPE_AVI_NINI:
      demux_close_avi(demuxer); return;
#ifdef HAVE_XMMS
    case DEMUXER_TYPE_XMMS:
      demux_close_xmms(demuxer); break;
#endif
#ifdef HAVE_GIF

    case DEMUXER_TYPE_LAVF:
      demux_close_lavf(demuxer); break;
#endif
    }
    // free streams:
    for(i=0;i<256;i++){
	if(demuxer->a_streams[i]) free_sh_audio(demuxer->a_streams[i]);
	if(demuxer->v_streams[i]) free_sh_video(demuxer->v_streams[i]);
    }
    //if(sh_audio) free_sh_audio(sh_audio);
    //if(sh_video) free_sh_video(sh_video);
    // free demuxers:
    free_demuxer_stream(demuxer->audio);
    free_demuxer_stream(demuxer->video);

    {
      if(demuxer->synced==2)
        mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug);
      else
        mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_NotSystemStream);
      free_demuxer(demuxer);
      demuxer = NULL;
    }
  }
  break;

14666:91bbfcb66883

#ifdef STREAMING_LIVE_DOT_COM
    case DEMUXER_TYPE_RTP:
      demux_close_rtp(demuxer); break;
#endif
    case DEMUXER_TYPE_SMJPEG:
      demux_close_smjpeg(demuxer); break;
    case DEMUXER_TYPE_DEMUXERS:
      demux_close_demuxers(demuxer); break;
    case DEMUXER_TYPE_AVI: 
    case DEMUXER_TYPE_AVI_NI:
    case DEMUXER_TYPE_AVI_NINI:
      demux_close_avi(demuxer); break;
#ifdef HAVE_XMMS
    case DEMUXER_TYPE_XMMS:
      demux_close_xmms(demuxer); break;
#endif
#ifdef HAVE_GIF

    case DEMUXER_TYPE_LAVF:
      demux_close_lavf(demuxer); break;
#endif
    }
    // free streams:
    for(i = 0; i < MAX_A_STREAMS; i++)
	if(demuxer->a_streams[i]) free_sh_audio(demuxer->a_streams[i]);
    for(i = 0; i < MAX_V_STREAMS; i++)
	if(demuxer->v_streams[i]) free_sh_video(demuxer->v_streams[i]);
    //if(sh_audio) free_sh_audio(sh_audio);
    //if(sh_video) free_sh_video(sh_video);
    // free demuxers:
    free_demuxer_stream(demuxer->audio);
    free_demuxer_stream(demuxer->video);

    {
      if(demuxer->synced==2)
        mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug);
      else
        mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_NotSystemStream);
    }
    if (demuxer && file_format != DEMUXER_TYPE_MPEG_PS) {
      free_demuxer(demuxer);
      demuxer = NULL;
    }
  }
  break;