diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-08-21 18:51:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 18:51:27 +0000 |
| commit | ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea (patch) | |
| tree | f5e0756fd218a0e06e61ce391d2b61e6c88c555d /media/libmedia | |
| parent | fd1d6df52f4c33f59d44abdbcdd0ec5b9a20f059 (diff) | |
| parent | 8de6d690ae5843bd8e005deedea571596f79bbd3 (diff) | |
| download | frameworks_av-ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea.zip frameworks_av-ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea.tar.gz frameworks_av-ca095ac251ad02ad745d763f37ec3fcc5a8aa2ea.tar.bz2 | |
am 8de6d690: Fix build break DO NOT MERGE
* commit '8de6d690ae5843bd8e005deedea571596f79bbd3':
Fix build break DO NOT MERGE
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/ICrypto.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/ICrypto.cpp b/media/libmedia/ICrypto.cpp index 55e9695..bff4639 100644 --- a/media/libmedia/ICrypto.cpp +++ b/media/libmedia/ICrypto.cpp @@ -247,7 +247,7 @@ status_t BnCrypto::onTransact( subSamples, sizeof(CryptoPlugin::SubSample) * numSubSamples); - void *secureBufferId, dstPtr; + void *secureBufferId, *dstPtr; if (secure) { secureBufferId = (void *)data.readIntPtr(); } else { |