commit ba6b1bc38e0c355277f69af286469adb5f02e876
author Andreas Huber <andih@google.com> Fri Nov 30 08:50:09 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 30 08:50:09 2012 -0800
tree caef7ed2c1440c9724b9b1588acd51c5f6e20d1b
parent 2ee204af3d715b983bc4806fb830feefd401fd4b
parent e7550eb2805d864253f88ea2ced57014d6140e55

am e7550eb2: Merge "Initialize and copy mRotationAngle in VideoFrame"

* commit 'e7550eb2805d864253f88ea2ced57014d6140e55':
  Initialize and copy mRotationAngle in VideoFrame

include/private/media/VideoFrame.h

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 @@
 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 @@
                 mSize = 0;
             }
         }
+        mRotationAngle = copy.mRotationAngle;
     }
 
     ~VideoFrame() {