diff options
| author | Andreas Huber <andih@google.com> | 2012-11-30 08:51:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-30 08:51:51 -0800 |
| commit | 24ee6aaf1368e3a07061948273c629d05cb9b12a (patch) | |
| tree | c915ddc3f5b594050258178b31075ff073b1b570 /include/private | |
| parent | 45f7c446777171a728f9eb257f48145dde5d19e2 (diff) | |
| parent | ba6b1bc38e0c355277f69af286469adb5f02e876 (diff) | |
| download | frameworks_av-24ee6aaf1368e3a07061948273c629d05cb9b12a.zip frameworks_av-24ee6aaf1368e3a07061948273c629d05cb9b12a.tar.gz frameworks_av-24ee6aaf1368e3a07061948273c629d05cb9b12a.tar.bz2 | |
am ba6b1bc3: am e7550eb2: Merge "Initialize and copy mRotationAngle in VideoFrame"
* commit 'ba6b1bc38e0c355277f69af286469adb5f02e876':
Initialize and copy mRotationAngle in VideoFrame
Diffstat (limited to 'include/private')
| -rw-r--r-- | include/private/media/VideoFrame.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/private/media/VideoFrame.h b/include/private/media/VideoFrame.h index 0ecc348..a211ed9 100644 --- a/include/private/media/VideoFrame.h +++ b/include/private/media/VideoFrame.h @@ -88,7 +88,8 @@ public: class VideoFrame { public: - VideoFrame(): mWidth(0), mHeight(0), mDisplayWidth(0), mDisplayHeight(0), mSize(0), mData(0) {} + VideoFrame(): mWidth(0), mHeight(0), mDisplayWidth(0), mDisplayHeight(0), mSize(0), mData(0), + mRotationAngle(0) {} VideoFrame(const VideoFrame& copy) { mWidth = copy.mWidth; @@ -105,6 +106,7 @@ public: mSize = 0; } } + mRotationAngle = copy.mRotationAngle; } ~VideoFrame() { |