mirror of https://git.ffmpeg.org/ffmpeg.git
93342de1d8
* 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> |
||
|---|---|---|
| .. | ||
| fate | ||
| ref | ||
| Makefile | ||
| asynth1.sw | ||
| audiogen.c | ||
| base64.c | ||
| copycooker.sh | ||
| fate-run.sh | ||
| fate-update.sh | ||
| fate-valgrind.supp | ||
| fate.sh | ||
| fate_config.sh.template | ||
| ffserver-regression.sh | ||
| ffserver.conf | ||
| ffserver.regression.ref | ||
| lavf-regression.sh | ||
| lavfi-regression.sh | ||
| lena.pnm | ||
| md5.sh | ||
| regression-funcs.sh | ||
| rotozoom.c | ||
| tiny_psnr.c | ||
| utils.c | ||
| videogen.c | ||