• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · f7d4e26c
    Michael Niedermayer authored
    * qatar/master:
      rtmp: Add a new option 'rtmp_pageurl'
      doc: Update the description of the rtmp_tcurl option
      rtmp: Make the description of the rtmp_tcurl option more generic
      libfdk-aacenc: add LATM/LOAS encapsulation support
      sctp: add port missing error message
      tcp: add port missing error message
      avfilter: Fix printf format string conversion specifier
    
    Conflicts:
    	libavcodec/version.h
    	libavfilter/avfilter.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    f7d4e26c
version.h 3.06 KB