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)
* commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371':
  rtsp: Factor out fmtp parsing

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

Simple merge