| commit | 8656145e2abe881caffa4181ee5c2e4e3dba1cee | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Wed Apr 14 10:16:35 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 14 10:16:35 2010 -0700 |
| tree | e2467bcc5f4d46a603693a3e249a1453089b81fa | |
| parent | d3d445b1dca98728a37b5163e018ba890fd9cc50 [diff] | |
| parent | 399cccb85749e02f6d3e12d1d2846310e7cbfdf1 [diff] |
Merge "Fix issue #593153: Broadcast time out when sending..." into froyo
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 594e010..a6d8d2c 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -747,6 +747,11 @@ } } + // Use PV_PLAYER for rtsp for now + if (!strncasecmp(url, "rtsp://", 7)) { + return PV_PLAYER; + } + return getDefaultPlayerType(); }