Merge commit '3f95f0dda55fca74b646937095a02a8fa9776622'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Jan 2013 12:13:01 +0000 (13:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Jan 2013 12:13:30 +0000 (13:13 +0100)
* commit '3f95f0dda55fca74b646937095a02a8fa9776622':
  rtpdec: Move the URLContext used for RTCP RR out from the context, to a parameter

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

Simple merge
Simple merge
Simple merge