Merge commit 'df3795025337479a639cb3cd26c93a4e82ccd4db'
authorClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 15:47:41 +0000 (16:47 +0100)
committerClément Bœsch <u@pkh.me>
Mon, 20 Mar 2017 15:47:41 +0000 (16:47 +0100)
* commit 'df3795025337479a639cb3cd26c93a4e82ccd4db':
  rtsp: Fix a crash with the RTSP muxer

This commit is a noop, see f8a13c72132a65e34e05b878dc780ad330dd7371

Merged-by: Clément Bœsch <u@pkh.me>

Trivial merge