diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-24 20:43:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-24 21:15:57 +0200 |
| commit | 93342de1d88081822dad55af70dd4738cd15d242 (patch) | |
| tree | 7dd3f6fe644743880f7be2554570bda7497688c7 /libavformat/adxdec.c | |
| parent | 3ccf22c64a0065fa08fe642500f193394fd83d01 (diff) | |
| parent | 6a433fdba82ff241be2e9193f66a43689766e4d7 (diff) | |
| download | ffmpeg-93342de1d88081822dad55af70dd4738cd15d242.tar.gz | |
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>
Diffstat (limited to 'libavformat/adxdec.c')
0 files changed, 0 insertions, 0 deletions