diff options
| author | Andreas Huber <andih@google.com> | 2011-11-08 10:40:20 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-11-08 10:40:20 -0800 |
| commit | 471af5aaea2d2491a77dba379771f7c96b9ca3c3 (patch) | |
| tree | 29609e7feb5c548e28ce94f88b4445c5c373d725 /cmds | |
| parent | 3b86c964df855a9740c446e984309b719c3ec37c (diff) | |
| parent | 936a981ba15d528a023311aa32f46446813551d9 (diff) | |
| download | frameworks_av-471af5aaea2d2491a77dba379771f7c96b9ca3c3.zip frameworks_av-471af5aaea2d2491a77dba379771f7c96b9ca3c3.tar.gz frameworks_av-471af5aaea2d2491a77dba379771f7c96b9ca3c3.tar.bz2 | |
resolved conflicts for merge of 26f70db9 to master
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
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 42f5534..24403dc 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(); |