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
..
asf
2012-05-17 03:29:21 +02:00
avi
2012-05-17 03:29:21 +02:00
dpx
2012-04-06 19:50:37 +02:00
ffm
2012-05-17 03:29:21 +02:00
gxf
2012-07-04 16:20:47 +02:00
2012-07-04 16:20:47 +02:00
jpg
2010-03-15 16:37:02 +00:00
mkv
2012-05-17 03:29:21 +02:00
mpg
2012-07-04 16:20:47 +02:00
mxf
2012-07-04 16:20:47 +02:00
nut
2012-05-17 03:29:21 +02:00
ogg
2012-07-04 16:20:47 +02:00
pam
2012-05-15 19:47:18 +01:00
rm
2012-05-17 03:29:21 +02:00
2012-03-03 20:57:03 -05:00
ts
2012-05-17 03:29:21 +02:00
voc
2012-06-25 03:30:12 +02:00
wtv
2012-05-17 03:29:21 +02:00
xbm
2012-04-09 17:21:35 +02:00