summaryrefslogtreecommitdiffstats
path: root/media/jni
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-09-07 19:20:45 +0800
committerChih-Chung Chang <chihchung@google.com>2011-09-07 19:20:45 +0800
commit47a52158d2df0eb818bf7d589d8ff9fd5c0daaa3 (patch)
treebfeb04d14957f9d5787622a08b6d3bf767cb929f /media/jni
parent7a57009c3ab5e4a55db448596a650261e878c975 (diff)
downloadframeworks_base-47a52158d2df0eb818bf7d589d8ff9fd5c0daaa3.zip
frameworks_base-47a52158d2df0eb818bf7d589d8ff9fd5c0daaa3.tar.gz
frameworks_base-47a52158d2df0eb818bf7d589d8ff9fd5c0daaa3.tar.bz2
Fix 5156702: rotate thumbnails
Change-Id: I97b51dadf129172d5b154e9dfd66da254e4559d7
Diffstat (limited to 'media/jni')
-rwxr-xr-xmedia/jni/mediaeditor/VideoEditorMain.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/media/jni/mediaeditor/VideoEditorMain.cpp b/media/jni/mediaeditor/VideoEditorMain.cpp
index 4e73581..4e954fc 100755
--- a/media/jni/mediaeditor/VideoEditorMain.cpp
+++ b/media/jni/mediaeditor/VideoEditorMain.cpp
@@ -185,7 +185,6 @@ static int videoEditor_getPixelsList(
M4OSA_UInt32 width,
M4OSA_UInt32 height,
M4OSA_UInt32 noOfThumbnails,
- M4OSA_UInt32 videoRotation,
jlong startTime,
jlong endTime,
jintArray indexArray,
@@ -292,7 +291,7 @@ static JNINativeMethod gManualEditMethods[] = {
(void *)videoEditor_release },
{"nativeGetPixels", "(Ljava/lang/String;[IIIJ)I",
(void*)videoEditor_getPixels },
- {"nativeGetPixelsList", "(Ljava/lang/String;[IIIIIJJ[ILandroid/media/videoeditor/MediaArtistNativeHelper$NativeGetPixelsListCallback;)I",
+ {"nativeGetPixelsList", "(Ljava/lang/String;[IIIIJJ[ILandroid/media/videoeditor/MediaArtistNativeHelper$NativeGetPixelsListCallback;)I",
(void*)videoEditor_getPixelsList },
{"getMediaProperties",
"(Ljava/lang/String;)Landroid/media/videoeditor/MediaArtistNativeHelper$Properties;",
@@ -2286,7 +2285,6 @@ static int videoEditor_getPixelsList(
M4OSA_UInt32 width,
M4OSA_UInt32 height,
M4OSA_UInt32 noOfThumbnails,
- M4OSA_UInt32 videoRotation,
jlong startTime,
jlong endTime,
jintArray indexArray,