diff options
| author | Lajos Molnar <lajos@google.com> | 2013-06-12 09:32:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-12 09:32:30 -0700 |
| commit | 63e9f73c2db01fec30246adbcfea2880671e2108 (patch) | |
| tree | e77ece5239d9503fed78872ecbaa216649a22a78 /include | |
| parent | fe9a901a445633e70073b1b91fca3af34d8e8132 (diff) | |
| parent | f8af99b7c10f1441d9a52676724b168f20752270 (diff) | |
| download | frameworks_av-63e9f73c2db01fec30246adbcfea2880671e2108.zip frameworks_av-63e9f73c2db01fec30246adbcfea2880671e2108.tar.gz frameworks_av-63e9f73c2db01fec30246adbcfea2880671e2108.tar.bz2 | |
am f8af99b7: am 0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev
* commit 'f8af99b7c10f1441d9a52676724b168f20752270':
stagefright: synchronously change nativewindow crop
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/ACodec.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index 391c089..8876c9b 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -278,7 +278,7 @@ private: void deferMessage(const sp<AMessage> &msg); void processDeferredMessages(); - void sendFormatChange(); + void sendFormatChange(const sp<AMessage> &reply); void signalError( OMX_ERRORTYPE error = OMX_ErrorUndefined, |