Michael Niedermayer 93342de1d8 Merge remote-tracking branch 'qatar/master' ... * qatar/master: rtmp: Add credit/copyright to librtmp authors for parts of the RTMPE code rtmp: Move the CONFIG_ condition into the if conditions aac: Mention abbreviation as well in long_name build: Skip compiling rtmpdh.h if ffrtmpcrypt protocol is not enabled doc: Add Git configuration section configure: Add a dependency on https for rtmpts rtp: Only choose static payload types if the sample rate and channels are right Conflicts: doc/git-howto.texi libavformat/rtmpproto.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-07-24 21:15:57 +02:00
..
fate	fate: enable fate-vc1_sa10143	2012-07-23 22:12:12 +02:00
ref	Merge remote-tracking branch 'qatar/master'	2012-07-24 21:15:57 +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	Merge remote-tracking branch 'qatar/master'	2012-07-09 22:40:12 +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	mem: heap memory poisoning.	2012-07-02 21:02:15 +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	vocenc: change default codec to 16bit	2012-06-25 03:35:09 +02:00
lavfi-regression.sh	lavfi: add alphaextract and alphamerge filters	2012-07-22 12:17:34 +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-07-22 23:56:21 +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