Merge commit '764ec70149728be82304c163ccc4e280f1629201'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 16:37:34 +0000 (18:37 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 30 Jul 2015 16:37:37 +0000 (18:37 +0200)
* commit '764ec70149728be82304c163ccc4e280f1629201':
  rtsp: Only interpret $ as interleaved packet indicator at the start of replies

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
libavformat/rtsp.c

Simple merge