• 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
Name
Last commit
Last update
..
fate Loading commit data...
ref Loading commit data...
Makefile Loading commit data...
asynth1.sw Loading commit data...
audiogen.c Loading commit data...
base64.c Loading commit data...
copycooker.sh Loading commit data...
fate-run.sh Loading commit data...
fate-update.sh Loading commit data...
fate-valgrind.supp Loading commit data...
fate.sh Loading commit data...
ffserver-regression.sh Loading commit data...
ffserver.conf Loading commit data...
ffserver.regression.ref Loading commit data...
lavf-regression.sh Loading commit data...
lavfi-regression.sh Loading commit data...
lena.pnm Loading commit data...
md5.sh Loading commit data...
regression-funcs.sh Loading commit data...
rotozoom.c Loading commit data...
test.ffmeta Loading commit data...
tiny_psnr.c Loading commit data...
utils.c Loading commit data...
videogen.c Loading commit data...