1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/tests
Michael Niedermayer 6716e6892b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  FATE: Add ZeroCodec test
  oggparseogm: fix order of arguments of avpriv_set_pts_info().
  pngenc: better upper bound for encoded frame size.
  aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
  aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
  aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
  aiffdec: do not set bit rate if block duration is unknown
  wmall: output packet only if we have decoded some samples

Conflicts:
	libavcodec/pngenc.c
	tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-22 20:59:58 +01:00
..
fate Merge remote-tracking branch 'qatar/master' 2012-03-22 20:59:58 +01:00
ref FATE: Add ZeroCodec test 2012-03-22 19:52:56 +01:00
asynth1.sw movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
audiogen.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
base64.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
codec-regression.sh Merge remote-tracking branch 'qatar/master' 2012-03-17 23:16:05 +01:00
copycooker.sh
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' 2012-03-18 23:39:42 +01:00
fate-update.sh
fate-valgrind.supp Add a --valgrind configure option. 2012-01-21 12:04:46 +01:00
fate.sh fate: add support for specifying the shell used to run configure 2012-01-30 20:35:09 +01:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00
lavfi-regression.sh fate: disable deshake test as it isnt binary identical across archs. 2012-02-29 07:03:04 +01:00
lena.pnm
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-17 04:43:12 +01:00
md5.sh
regression-funcs.sh Merge remote-tracking branch 'qatar/master' 2012-03-07 03:22:49 +01:00
rotozoom.c tests/rotozoom: make some things const. 2012-03-15 21:52:11 +01:00
tiny_psnr.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00
videogen.c Merge remote-tracking branch 'qatar/master' 2012-01-19 01:19:38 +01:00