• Michael Niedermayer's avatar
    Merge commit 'b94e4acb' · 50b54776
    Michael Niedermayer authored
    * commit 'b94e4acb':
      cmdutils_read_file: increment *size after writing the trailing \0
      af_resample: unref out_buf when avresample_convert returns 0
      af_amix: prevent memory leak on error path
      vc1dec: prevent memory leak in error path
      vc1dec: prevent memory leak on av_realloc error
      af_channelmap: free old extended_data on reallocation
      avconv: simplify memory allocation in copy_chapters
      matroskaenc: check cue point validity before reallocation
      swfenc: error out for more than 1 audio or video stream
      build: link test programs only against static libs
    
    Conflicts:
    	ffmpeg_opt.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    50b54776
matroskaenc.c 47.4 KB