1. 10 Oct, 2012 4 commits
    • 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
    • Michael Niedermayer's avatar
      Merge commit 'cbcd497f' · eadba3e9
      Michael Niedermayer authored
      * commit 'cbcd497f':
        adxdec: use planar sample format
        adpcmdec: use planar sample format for adpcm_thp
        adpcmdec: use planar sample format for adpcm_ea_xas
        adpcmdec: use planar sample format for adpcm_ea_r1/r2/r3
        adpcmdec: use planar sample format for adpcm_xa
        adpcmdec: use planar sample format for adpcm_ima_ws for vqa version 3
        adpcmdec: use planar sample format for adpcm_4xm
        adpcmdec: use planar sample format for adpcm_ima_wav
        adpcmdec: use planar sample format for adpcm_ima_qt
        pcmdec: use planar sample format for pcm_lxf
        mace: use planar sample format
        atrac1: use planar sample format
        build: non-x86: Only compile mpegvideo optimizations when necessary
        rtpdec_mpeg4: au_headers is a single array, simple av_free is enough
        avcodec: free extended_data instead address of it
        fate: Add tests of the ff_make_absolute_url function
        url: Handle relative urls starting with two slashes
        url: Handle relative urls being just a new query string
        url: Don't treat slashes in query parameters as directory separators
      
      Conflicts:
      	libavcodec/adxdec.c
      	libavcodec/mips/Makefile
      	libavcodec/pcm.c
      	libavcodec/utils.c
      	libavformat/Makefile
      	libavformat/utils.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      eadba3e9
    • Paul B Mahol's avatar
      pcx: use meaningful return values · b4e516e3
      Paul B Mahol authored
      Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
      b4e516e3
    • Michael Niedermayer's avatar
  2. 09 Oct, 2012 36 commits