diff options
| author | Andreas Huber <andih@google.com> | 2010-10-01 11:21:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 11:21:16 -0700 |
| commit | 969247b7ab387743035dece47356678c8aec2ac4 (patch) | |
| tree | 2268be28b510f091317a8bc54e575dd99337a65d /media/libstagefright/AwesomePlayer.cpp | |
| parent | 9ad6e8bd9fab860e639f6ce95479e4b2a9b03ff5 (diff) | |
| parent | 32d34824b2bad653ec5e9ef767e50f13a8c182d7 (diff) | |
| download | frameworks_av-969247b7ab387743035dece47356678c8aec2ac4.zip frameworks_av-969247b7ab387743035dece47356678c8aec2ac4.tar.gz frameworks_av-969247b7ab387743035dece47356678c8aec2ac4.tar.bz2 | |
am 14401bf7: am d1398db3: Merge "Squashed commit of the following:" into gingerbread
Merge commit '14401bf7bca34c692f248406c78bd8b49783217a'
* commit '14401bf7bca34c692f248406c78bd8b49783217a':
Squashed commit of the following:
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 97c9003..1e73afe 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -277,6 +277,7 @@ status_t AwesomePlayer::setDataSource_l( status_t AwesomePlayer::setDataSource( int fd, int64_t offset, int64_t length) { #if 0 + // return setDataSource("httplive://ipad.akamai.com/Video_Content/usat/tt_062209_iphone/440k/prog_index.m3u8"); // return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/sl.m3u8"); return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/0440.m3u8"); // return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/0640.m3u8"); |