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)
* qatar/master:
  sdp: Add an option for sending RTCP packets to the source of the last packets

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

Simple merge
Simple merge