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)
commit870f506cfeec6338be77d945ebecc4cfd75353aa
treea8384b2876ec8886c63679b43bff8e51690dff82
parent0b712f5d5e5f1552940ea1ad074f6298f6397a24
parent1f57d60129b0e297cd197c6031c4439b30a6b503
Merge commit '1f57d60129b0e297cd197c6031c4439b30a6b503'

* commit '1f57d60129b0e297cd197c6031c4439b30a6b503':
  rtsp: Support RFC4570 (source specific multicast) more properly.

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