Merge commit 'f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5'
authorJames Almer <jamrial@gmail.com>
Sun, 10 Dec 2017 23:44:26 +0000 (20:44 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 10 Dec 2017 23:44:26 +0000 (20:44 -0300)
* commit 'f6161fccf8c5720ceac1ed1df8ba60ff8fed69f5':
  rtsp: only break on parse_rtsp_message on error

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavformat/rtsp.c

Simple merge