[FFmpeg-cvslog] Merge commit 'ca960161f087ca38267b88ce90592010c59584f1'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 14:14:26 2017 -0300| [12b6166bcfb4fbdbc8b1e3a26a64c4ee8aa0e700] | committer: James Almer

Merge commit 'ca960161f087ca38267b88ce90592010c59584f1'

* commit 'ca960161f087ca38267b88ce90592010c59584f1':
  rtsp: Move message parsing to a separate function

This commit is a noop, see 1e27837265702b63db65122e97178a0ca4d25e05

Merged-by: James Almer <jamrial at gmail.com>

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