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
audiogen.c
base64.c
copycooker.sh
fate_config.sh.template
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	mem: heap memory poisoning.	2012-07-02 21:02:15 +02:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
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
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
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