am ad1831a5: (-s ours) am e0c9f275: (-s ours) am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant RTSP servers.

* commit 'ad1831a56fd60779464326468ee1d471a10f71a0':
  DO NOT MERGE: Work around several issues with non-compliant RTSP servers.