• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 93342de1
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    93342de1
Makefile 22.3 KB