Merge remote-tracking branch 'qatar/master'
* 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: NMichael Niedermayer <michaelni@gmx.at>
Showing
libavformat/rtpdec_speex.c
已删除
100644 → 0
想要评论请 注册 或 登录