Merge commit 'a05f5052fef3b3743fab7846da12861d8a8098ec'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Sep 2014 18:26:12 +0000 (20:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Sep 2014 18:26:15 +0000 (20:26 +0200)
commit77ab7407c2728de7517be81311bf84426b898685
tree647020719aefa75e563a94d099f92df99a11a8d4
parentcf32181b70116309b3a33c8f6bf017a0d0a33089
parenta05f5052fef3b3743fab7846da12861d8a8098ec
Merge commit 'a05f5052fef3b3743fab7846da12861d8a8098ec'

* commit 'a05f5052fef3b3743fab7846da12861d8a8098ec':
  sdp: Make opus declaration conform to the spec

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