diff options
| author | Mike Reed <reed@google.com> | 2014-08-07 17:03:17 -0400 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2014-08-14 09:57:06 -0400 |
| commit | 021a3443c6f86ece7f59fa9291cc0ba70ba71b1f (patch) | |
| tree | 164e625b77851907271cf89f647ff463ea4df436 /media/jni/android_media_MediaMetadataRetriever.cpp | |
| parent | 45b851559c7ee7ec28c0085fd81de487dcb60c76 (diff) | |
| download | frameworks_base-021a3443c6f86ece7f59fa9291cc0ba70ba71b1f.zip frameworks_base-021a3443c6f86ece7f59fa9291cc0ba70ba71b1f.tar.gz frameworks_base-021a3443c6f86ece7f59fa9291cc0ba70ba71b1f.tar.bz2 | |
SkBitmap::Config is deprecated
Change-Id: I0bbd929074474ae3c1d497c2f645417e4876d9e3
Diffstat (limited to 'media/jni/android_media_MediaMetadataRetriever.cpp')
| -rw-r--r-- | media/jni/android_media_MediaMetadataRetriever.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaMetadataRetriever.cpp b/media/jni/android_media_MediaMetadataRetriever.cpp index fbe5340..ac8a929 100644 --- a/media/jni/android_media_MediaMetadataRetriever.cpp +++ b/media/jni/android_media_MediaMetadataRetriever.cpp @@ -33,6 +33,7 @@ #include "android_media_Utils.h" #include "android_util_Binder.h" +#include "android/graphics/GraphicsJNI.h" using namespace android; @@ -255,7 +256,7 @@ static jobject android_media_MediaMetadataRetriever_getFrameAtTime(JNIEnv *env, jobject config = env->CallStaticObjectMethod( fields.configClazz, fields.createConfigMethod, - SkBitmap::kRGB_565_Config); + GraphicsJNI::colorTypeToLegacyBitmapConfig(kRGB_565_SkColorType)); uint32_t width, height; bool swapWidthAndHeight = false; |