• Andreas Rheinhardt's avatar
    avformat/audiointerleave: Check before dereferencing · f1d46db9
    Andreas Rheinhardt authored
    In order to use ff_audio_rechunk_interleave() (a special interleavement
    function for situations where the ordinary "interleave by dts" is not
    appropriate), the AVStreams must have private data and this private data
    must begin with an AudioInterleaveContext which contains a fifo that may
    need to be freed and when ff_audio_interleave_close() was called, it just
    assumed that everything has been properly set up, i.e. that every streams
    priv_data exists. This implies that this function can not be called from
    the deinit function of a muxer, because such functions might be called
    if the private data has not been successfully allocated. In order to
    change this, add a check for whether the private data exists before
    trying to free the fifo in it.
    Signed-off-by: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
    Reviewed-by: 's avatarPaul B Mahol <onemda@gmail.com>
    Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
    f1d46db9
audiointerleave.c 5.06 KB