diff options
| author | Andreas Huber <andih@google.com> | 2011-01-21 14:44:21 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-21 14:44:21 -0800 |
| commit | e8600e37d70d5570d73353e892edb00dd872d1c5 (patch) | |
| tree | 94edbf7e75265604b7c75d33c6a30f0d781b509d /include | |
| parent | 42ab78068f67d5b22fbfbcf40448bae505d543ca (diff) | |
| parent | 7fac331b39ca49ce49a67e425dcc031a3cb9e97f (diff) | |
| download | frameworks_av-e8600e37d70d5570d73353e892edb00dd872d1c5.zip frameworks_av-e8600e37d70d5570d73353e892edb00dd872d1c5.tar.gz frameworks_av-e8600e37d70d5570d73353e892edb00dd872d1c5.tar.bz2 | |
am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded to a surface." into honeycomb
* commit '63d64a14790ae21db31b60747864b4a7565b33c3':
Properly rotate video that's marked as such and decoded to a surface.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index f8daa4f..3251c28 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -305,6 +305,8 @@ private: void restorePatchedDataPointer(BufferInfo *info); + status_t applyRotation(); + OMXCodec(const OMXCodec &); OMXCodec &operator=(const OMXCodec &); }; |