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

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