summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-11-08 19:25:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-08 19:25:41 -0800
commit2cef2eff28fd5ba3eaa875dd2e22e74b6f464121 (patch)
treefccc5363910bb749a95cecaa9d8a48b867a83693 /include
parent858154e43f7646b767ef4c27af889c741fc5d9c2 (diff)
parentbeda607a0b2775484b10d7e6a15eec1e956b3cec (diff)
downloadframeworks_av-2cef2eff28fd5ba3eaa875dd2e22e74b6f464121.zip
frameworks_av-2cef2eff28fd5ba3eaa875dd2e22e74b6f464121.tar.gz
frameworks_av-2cef2eff28fd5ba3eaa875dd2e22e74b6f464121.tar.bz2
am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread
* commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84': Support extracting thumbnail from rotated video tracks
Diffstat (limited to 'include')
-rw-r--r--include/private/media/VideoFrame.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/private/media/VideoFrame.h b/include/private/media/VideoFrame.h
index 9c35274..3aff0c6 100644
--- a/include/private/media/VideoFrame.h
+++ b/include/private/media/VideoFrame.h
@@ -120,6 +120,7 @@ public:
uint32_t mDisplayHeight;
uint32_t mSize; // Number of bytes in mData
uint8_t* mData; // Actual binary data
+ int32_t mRotationAngle; // rotation angle, clockwise
};
}; // namespace android