diff options
| author | Shailendra <shailendray@google.com> | 2011-06-22 14:13:21 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-22 14:13:21 -0700 |
| commit | 31f8b6285529fd1deae93a3bb34d6c89d7926747 (patch) | |
| tree | 454dc505c7f74ad1447b192d28ff3c9b22bcb9c5 /media | |
| parent | 019caf42c0df10c0ed0a0242ea7a39321a36f483 (diff) | |
| parent | d7ed5992634596a53f32f66277de6d287ffb752f (diff) | |
| download | frameworks_base-31f8b6285529fd1deae93a3bb34d6c89d7926747.zip frameworks_base-31f8b6285529fd1deae93a3bb34d6c89d7926747.tar.gz frameworks_base-31f8b6285529fd1deae93a3bb34d6c89d7926747.tar.bz2 | |
Merge "Fix for kenBurn Effect for PNG image is crashing (4861071 )"
Diffstat (limited to 'media')
| -rwxr-xr-x | media/jni/mediaeditor/VideoEditorClasses.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/jni/mediaeditor/VideoEditorClasses.cpp b/media/jni/mediaeditor/VideoEditorClasses.cpp index 5696433..d43a562 100755 --- a/media/jni/mediaeditor/VideoEditorClasses.cpp +++ b/media/jni/mediaeditor/VideoEditorClasses.cpp @@ -144,6 +144,7 @@ VIDEOEDIT_JAVA_DEFINE_CONSTANTS(ClipType) VIDEOEDIT_JAVA_CONSTANT_INIT("MP3", M4VIDEOEDITING_kFileType_MP3), VIDEOEDIT_JAVA_CONSTANT_INIT("PCM", M4VIDEOEDITING_kFileType_PCM), VIDEOEDIT_JAVA_CONSTANT_INIT("JPG", M4VIDEOEDITING_kFileType_JPG), + VIDEOEDIT_JAVA_CONSTANT_INIT("PNG", M4VIDEOEDITING_kFileType_PNG), VIDEOEDIT_JAVA_CONSTANT_INIT("M4V", M4VIDEOEDITING_kFileType_M4V), VIDEOEDIT_JAVA_CONSTANT_INIT("UNSUPPORTED", M4VIDEOEDITING_kFileType_Unsupported) }; @@ -1394,8 +1395,8 @@ videoEditClasses_getClipSettings( pSettings->FileType = (M4VIDEOEDITING_FileType)videoEditJava_getClipTypeJavaToC( &converted, pEnv->GetIntField(object, fieldIds.fileType)); - if ( pSettings->FileType == M4VIDEOEDITING_kFileType_JPG) - { + if (( pSettings->FileType == M4VIDEOEDITING_kFileType_JPG) || + ( pSettings->FileType == M4VIDEOEDITING_kFileType_PNG)) { pSettings->FileType = M4VIDEOEDITING_kFileType_ARGB8888; } |