Merge commit '1f57d60129b0e297cd197c6031c4439b30a6b503'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:57:37 +0000 (11:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:57:43 +0000 (11:57 +0200)
* commit '1f57d60129b0e297cd197c6031c4439b30a6b503':
  rtsp: Support RFC4570 (source specific multicast) more properly.

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

Simple merge
Simple merge