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)
commitbc4bdc6d61527e9e1bd2ff6d39ee68eac68ff9de
treefc0d84b05d44f452124bcf70207af479e49a2f1d
parentd560c61125b3ee0ec8cd2e228f0604b63f85b8b2
parent764ec70149728be82304c163ccc4e280f1629201
Merge commit '764ec70149728be82304c163ccc4e280f1629201'

* commit '764ec70149728be82304c163ccc4e280f1629201':
  rtsp: Only interpret $ as interleaved packet indicator at the start of replies

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