1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/tests
Michael Niedermayer eadba3e94d Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'
* commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f':
  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: Michael Niedermayer <michaelni@gmx.at>
2012-10-10 13:01:27 +02:00
..
fate Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f' 2012-10-10 13:01:27 +02:00
ref Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f' 2012-10-10 13:01:27 +02:00
asynth1.sw
audiogen.c Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
base64.c
copycooker.sh
fate-run.sh Merge remote-tracking branch 'qatar/master' 2012-07-09 22:40:12 +02:00
fate-update.sh
fate-valgrind.supp
fate.sh Merge remote-tracking branch 'qatar/master' 2012-09-06 16:23:17 +02:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh fate: add faststart regression test. 2012-09-27 08:59:37 +02:00
lavfi-regression.sh tests/lavfi-regression: name temporary files after $testname in do_lavfi_pixfmts() 2012-09-06 01:09:36 +02:00
lena.pnm
Makefile Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f' 2012-10-10 13:01:27 +02:00
md5.sh
regression-funcs.sh
rotozoom.c
test.ffmeta fate/ffprobe: add some stream metadata. 2012-10-08 11:03:27 +02:00
tiny_psnr.c tiny_psnr: fix undefined shift 2012-08-01 20:00:01 +02:00
utils.c
videogen.c