• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 82edf672
    Michael Niedermayer authored
    * qatar/master:
      lavr: add x86-optimized functions for mixing 1-to-2 s16p with flt coeffs
      lavr: add x86-optimized functions for mixing 1-to-2 fltp with flt coeffs
      Add Dolby/DPLII downmix support to libavresample
      vorbisdec: replace div/mod in loop with a counter
      fate: vorbis: add 5.1 surround test
      rtpenc: Allow requesting H264 RTP packetization mode 0
      configure: Sort the library listings in the help text alphabetically
      dwt: remove variable-length arrays
      RTMPT protocol support
      http: Properly handle chunked transfer-encoding for replies to post data
      http: Fail reading if the connection has gone away
      amr: Mark an array const
      amr: More space cleanup
      rtpenc: Fix memory leaks in the muxer open function
    
    Conflicts:
    	Changelog
    	configure
    	doc/APIchanges
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    82edf672
rtpenc_h264.c 3.4 KB