commit e6ef83006a92a40ac8e28b83ca4f02a40e0b1063
author Alex Ray <aray@google.com> Fri Nov 30 11:39:43 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 30 11:39:43 2012 -0800
tree 97678bc370f2eb3b6428f564b427bcfe201c2a0c
parent 24ee6aaf1368e3a07061948273c629d05cb9b12a
parent 371eb9756c32109ea572b91216b19bb623f6d3fd

Merge "Remove conditional compilation of ATRACE functions"

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() {