diff options
| author | Andreas Huber <andih@google.com> | 2012-05-10 14:38:10 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-10 14:38:10 -0700 |
| commit | af9e6a17d7038b411b61a3cb0669694058511a05 (patch) | |
| tree | 1c6aed890adfd410be4710d5f6be462964ed89b3 /include | |
| parent | c3798d7e97cb11076310f06163417c0631cce04e (diff) | |
| parent | 7541ff5d83a3e77cb533841a0326a241550b95d9 (diff) | |
| download | frameworks_av-af9e6a17d7038b411b61a3cb0669694058511a05.zip frameworks_av-af9e6a17d7038b411b61a3cb0669694058511a05.tar.gz frameworks_av-af9e6a17d7038b411b61a3cb0669694058511a05.tar.bz2 | |
Merge "Properly connect/disconnect to/from the native window in MediaCodec." into jb-dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index d96007b..e46e8e9 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -210,6 +210,9 @@ private: void extractCSD(const sp<AMessage> &format); status_t queueCSDInputBuffer(size_t bufferIndex); + status_t setNativeWindow( + const sp<SurfaceTextureClient> &surfaceTextureClient); + DISALLOW_EVIL_CONSTRUCTORS(MediaCodec); }; |