]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '4d13bcceb9a1820f8e9b2c89e00816d3db41b716'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 12 Apr 2016 14:59:29 +0000 (15:59 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Tue, 12 Apr 2016 14:59:41 +0000 (15:59 +0100)
This commit is a no-op.

* commit '4d13bcceb9a1820f8e9b2c89e00816d3db41b716':
  sdp: fix opus sprop-stereo fmtp syntax

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Trivial merge