1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
FFmpeg/tests
Michael Niedermayer 175cc378b3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  movenc: Rudimentary IODs support.
  v410enc: fix output buffer size check
  v410enc: include correct headers
  fate: add -pix_fmt rgb48le to r210 test
  flvenc: Support muxing 16 kHz nellymoser
  configure: refactor list of programs into a variable
  fate: add r210 decoder test
  fate: split off Indeo FATE tests into their own file
  fate: split off ATRAC FATE tests into their own file
  fate: Add FATE tests for v410 encoder and decoder
  ARM: fix external symbol refs in rv40 asm
  westwood: Make sure audio header info is present when parsing audio packets
  libgsm: Reset the MS mode of GSM in the flush function
  libgsm: Set options on the right object
  ARM: dca: disable optimised decode_blockcodes() for old gcc

Conflicts:
	configure
	libavformat/movenc.c
	libavformat/movenc.h
	tests/fate2.mak
	tests/ref/acodec/alac
	tests/ref/vsynth1/mpeg4
	tests/ref/vsynth2/mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-16 01:23:15 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2011-12-16 01:23:15 +01:00
ref Merge remote-tracking branch 'qatar/master' 2011-12-16 01:23:15 +01:00
audiogen.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
base64.c
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2011-12-11 01:05:33 +01:00
copycooker.sh build: remove unused copy regression test script 2011-07-07 22:47:24 +02:00
fate2.mak fate: add -pix_fmt rgb48le to r210 test 2011-12-15 15:56:15 +01:00
fate_config.sh.template tests: add a FATE configuration template 2011-11-24 00:33:20 +01:00
fate-run.sh Merge remote-tracking branch 'qatar/master' 2011-10-10 03:50:58 +02:00
fate-update.sh
fate.mak Merge remote-tracking branch 'qatar/master' 2011-12-16 01:23:15 +01:00
fate.sh fate.sh: Ignore errors from rm command during cleanup. 2011-09-22 17:39:30 +02:00
ffserver-regression.sh Remove the ffserver test. 2011-08-01 11:36:16 +02:00
ffserver.conf Remove the ffserver test. 2011-08-01 11:36:16 +02:00
ffserver.regression.ref Remove the ffserver test. 2011-08-01 11:36:16 +02:00
lavf-regression.sh lavf-regression: minimal metadata test. 2011-12-12 20:51:29 +01:00
lavfi-regression.sh Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
lena.pnm
Makefile Merge remote-tracking branch 'qatar/master' 2011-12-16 01:23:15 +01:00
md5.sh
regression-funcs.sh Run zmbv regression without md5sum. 2011-12-10 19:34:28 +01:00
rotozoom.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
tiny_psnr.c tests: Remove disabled code. 2011-04-29 18:08:46 +02:00
videogen.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00