Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Sep 2012 12:23:23 +0000 (14:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 27 Sep 2012 12:29:03 +0000 (14:29 +0200)
commite760424ddd202e01119592044394d505810ae00a
tree448d22660a84f4516c9e1a5caeb66f9005a25a7a
parent00e1afd83f7585f4acb65911100d79e32c1f6fc4
parent93e81ee81c33e74e6047053f6086d63d2f8293d4
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: Michael Niedermayer <michaelni@gmx.at>
libavcodec/truemotion2.c
libavformat/Makefile
libavformat/nutdec.c
libavformat/rtpdec.c
libavformat/rtpdec_formats.h
libavformat/rtpenc.c
libavformat/sdp.c
libavformat/version.h