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