Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 10:42:37 +0000 (12:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 14 Aug 2013 10:42:44 +0000 (12:42 +0200)
commit20904518e98bcd4f578f97ccf27dee29f481e969
treefd537562bf0199c12ccc05f28be8c62cc3ab4379
parent2425be894a527640c98b8c30f3bbecce77e730f1
parentb56fc18b20d62c3d2a134b53738deaabfd491e89
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sdp: Add an option for sending RTCP packets to the source of the last packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtsp.c
libavformat/rtsp.h