Merge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648'
authorClément Bœsch <u@pkh.me>
Tue, 21 Jun 2016 20:26:44 +0000 (22:26 +0200)
committerClément Bœsch <u@pkh.me>
Tue, 21 Jun 2016 20:26:44 +0000 (22:26 +0200)
commit00e122bc0f2a4d867797f593770f9902f275b864
treee23dbf94682f975c5eb8960ddd7b1758cef14b31
parent4873952f886b718810e5ecf2ef26ca53173e9935
parentbc2a32969eb4db17677971def5ad5b936d9d1648
Merge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648'

* commit 'bc2a32969eb4db17677971def5ad5b936d9d1648':
  rtsp: Parse SSRC attributes in the SDP

Merged-by: Clément Bœsch <u@pkh.me>
libavformat/rtsp.c
libavformat/rtsp.h