Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Jul 2012 18:43:07 +0000 (20:43 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 24 Jul 2012 19:15:57 +0000 (21:15 +0200)
commit93342de1d88081822dad55af70dd4738cd15d242
tree7dd3f6fe644743880f7be2554570bda7497688c7
parent3ccf22c64a0065fa08fe642500f193394fd83d01
parent6a433fdba82ff241be2e9193f66a43689766e4d7
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>
doc/git-howto.texi
libavcodec/aacdec.c
libavformat/Makefile
libavformat/rtmpcrypt.c
libavformat/rtmpdh.c
libavformat/rtmpproto.c
libavformat/rtp.c
tests/ref/lavf/mov