Merge commit '74972220909787af5a3ffe66f7fa8041827c2bd2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:51:14 +0000 (11:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 30 Jul 2013 09:51:14 +0000 (11:51 +0200)
commit0b712f5d5e5f1552940ea1ad074f6298f6397a24
treea5c82385698c5b669cb7bd60a3ffb4fdec3841b2
parent42f7c45d7b856839fa613c22645d5bff5352fc87
parent74972220909787af5a3ffe66f7fa8041827c2bd2
Merge commit '74972220909787af5a3ffe66f7fa8041827c2bd2'

* commit '74972220909787af5a3ffe66f7fa8041827c2bd2':
  rtpproto: Support more than one SSM include address, support excludes

Conflicts:
libavformat/rtpproto.c

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