[FFmpeg-cvslog] Merge commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 23:22:08 2014 +0200| [be94f5c171d95c2a4e926c59f9fd08e57b47edf9] | committer: Michael Niedermayer

Merge commit 'c9c1e00f95350e7a36b0d05a03939c7f6438e371'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=be94f5c171d95c2a4e926c59f9fd08e57b47edf9
---