Merge commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 21:22:08 +0000 (23:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Jun 2014 21:22:12 +0000 (23:22 +0200)
commitbe94f5c171d95c2a4e926c59f9fd08e57b47edf9
treeea803eae609e9a2dc9fce574c4b61eaf0b7ab18b
parent1ebc77bc7d68748598878c08c85a571b526a729f
parentc9c1e00f95350e7a36b0d05a03939c7f6438e371
Merge commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371'

* commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371':
  rtsp: Factor out fmtp parsing

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