Michael Niedermayer 4453f6b861 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  flv: add support for G.711
  doc: git: Add checklist with test steps to perform before pushing
  flvenc: K&R formatting cosmetics
  movenc: Add channel layouts for PCM.

Conflicts:
	libavformat/flvenc.c
	tests/ref/fate/acodec-pcm-s16be
	tests/ref/fate/acodec-pcm-s24be
	tests/ref/fate/acodec-pcm-s32be
	tests/ref/fate/acodec-pcm-s8

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-06-28 23:57:31 +02:00

..

fate

fate: Try to fix source path for fate-acodec-dca

2012-06-25 01:58:18 +02:00

ref

Merge remote-tracking branch 'qatar/master'

2012-06-28 23:57:31 +02: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-04-20 22:18:26 +02:00

base64.c

Merge remote-tracking branch 'qatar/master'

2012-01-19 01:19:38 +01:00

copycooker.sh

build: remove unused copy regression test script

2011-07-07 22:47:24 +02:00

fate_config.sh.template

tests: add a FATE configuration template

2011-11-24 00:33:20 +01:00

fate-run.sh

enc_dec_pcm: add bitexact flag

2012-06-10 02:57:25 +02:00

fate-update.sh

fate: remove stale fate-update.sh script

2011-03-19 13:35:52 +00:00

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

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

vocenc: change default codec to 16bit

2012-06-25 03:35:09 +02:00

lavfi-regression.sh

fate/lavfi: add lavfi-pixfmts_super2xsai test

2012-06-16 00:30:33 +02:00

lena.pnm

finished integrating rotozoom test in ffmpeg

2003-04-11 13:43:17 +00:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-06-13 22:43:57 +02:00

md5.sh

fate: try to fix 3rd md5 implementation

2012-06-01 04:16:23 +02:00

regression-funcs.sh

fate: remove unused functions

2012-05-30 05:57:56 +02:00

rotozoom.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00

tiny_psnr.c

tiny_psnr: reindent after last commit.

2012-04-15 15:46:46 +02:00

utils.c

Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'

2012-05-30 01:40:54 +02:00

videogen.c

Merge remote-tracking branch 'qatar/master'

2012-06-07 21:45:52 +02:00