• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · e760424d
    Michael Niedermayer authored
    * qatar/master:
      nutdec: const correctness for get_v_trace/get_s_trace function arguments
      truemotion2: Request samples for old TM2 headers
      rtpdec: Remove a useless ff_ prefix from a static symbol
      rtpdec: Support depacketizing speex
      rtpenc: Add support for packetizing speex
    
    Conflicts:
    	libavformat/rtpdec.c
    	libavformat/sdp.c
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e760424d
truemotion2.c 28.8 KB