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)
* commit 'bc2a32969eb4db17677971def5ad5b936d9d1648':
  rtsp: Parse SSRC attributes in the SDP

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

Simple merge
Simple merge