Merge commit 'e02dcdf6bb6835ef4b49986b85a67efcb3495a7f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 11:41:37 +0000 (12:41 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 11:41:37 +0000 (12:41 +0100)
* commit 'e02dcdf6bb6835ef4b49986b85a67efcb3495a7f':
  rtsp: Allow $ as interleaved packet indicator before a complete response header

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavformat/rtsp.c

Simple merge