diff options
| author | Andreas Huber <andih@google.com> | 2011-11-08 17:58:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-08 17:58:45 +0000 |
| commit | d6739fccfc3f97a94366c537797b7b9821e64e15 (patch) | |
| tree | 1a995ff03132f2802098c6239b4f546f168bf9f2 /cmds | |
| parent | d57859c13ecd68b4c125ce65df18f7b43184eda8 (diff) | |
| parent | 26f70db99f483be36caa7a4c84fec5de50bec034 (diff) | |
| download | frameworks_base-d6739fccfc3f97a94366c537797b7b9821e64e15.zip frameworks_base-d6739fccfc3f97a94366c537797b7b9821e64e15.tar.gz frameworks_base-d6739fccfc3f97a94366c537797b7b9821e64e15.tar.bz2 | |
am 26f70db9: Merge "Remove surface legacy APIs and code." into ics-mr1
* commit '26f70db99f483be36caa7a4c84fec5de50bec034':
Remove surface legacy APIs and code.
Diffstat (limited to 'cmds')
| -rw-r--r-- | cmds/stagefright/stream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/stagefright/stream.cpp b/cmds/stagefright/stream.cpp index 2378345..bd430d1 100644 --- a/cmds/stagefright/stream.cpp +++ b/cmds/stagefright/stream.cpp @@ -360,7 +360,7 @@ int main(int argc, char **argv) { service->create(getpid(), client, 0); if (player != NULL && player->setDataSource(source) == NO_ERROR) { - player->setVideoSurface(surface); + player->setVideoSurfaceTexture(surface->getSurfaceTexture()); player->start(); client->waitForEOS(); |