diff options
| author | Marco Nelissen <marcone@google.com> | 2013-09-25 21:06:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-25 21:06:47 +0000 |
| commit | d7b5f3dab1c3bc0aa98698314183149426559a3c (patch) | |
| tree | 7c63f6d41da851d4dd1fd0882ed9cd7a4c175d03 | |
| parent | 9ca833f4a5eca732b1618bc1a183215c21ae11e5 (diff) | |
| parent | fd2e50086c4f4e2bb064c76a1de73e10c172f387 (diff) | |
| download | frameworks_base-d7b5f3dab1c3bc0aa98698314183149426559a3c.zip frameworks_base-d7b5f3dab1c3bc0aa98698314183149426559a3c.tar.gz frameworks_base-d7b5f3dab1c3bc0aa98698314183149426559a3c.tar.bz2 | |
Merge "Fix hang" into klp-dev
| -rw-r--r-- | media/jni/android_media_MediaCodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp index a859506..b8d437c 100644 --- a/media/jni/android_media_MediaCodec.cpp +++ b/media/jni/android_media_MediaCodec.cpp @@ -122,7 +122,7 @@ status_t JMediaCodec::configure( int flags) { sp<Surface> client; if (bufferProducer != NULL) { - mSurfaceTextureClient = new Surface(bufferProducer); + mSurfaceTextureClient = new Surface(bufferProducer, true /* controlledByApp */); } else { mSurfaceTextureClient.clear(); } |