ffmpeg | branch: master | Matthieu Bouron <matthieu.bou...@stupeflix.com> | Mon Jun 6 16:05:46 2016 +0200| [cb89fd2334d38d3fffa03da3f4851d3a4fc11f55] | committer: Matthieu Bouron
lavc/mediacodec: rename MediaFormat field clazz to mediaformat_class for consistency > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb89fd2334d38d3fffa03da3f4851d3a4fc11f55 --- libavcodec/mediacodec_wrapper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mediacodec_wrapper.c b/libavcodec/mediacodec_wrapper.c index 381c103..5567cb4 100644 --- a/libavcodec/mediacodec_wrapper.c +++ b/libavcodec/mediacodec_wrapper.c @@ -70,7 +70,7 @@ static const struct FFJniField jni_amediacodeclist_mapping[] = { struct JNIAMediaFormatFields { - jclass clazz; + jclass mediaformat_class; jmethodID init_id; @@ -91,7 +91,7 @@ struct JNIAMediaFormatFields { } JNIAMediaFormatFields; static const struct FFJniField jni_amediaformat_mapping[] = { - { "android/media/MediaFormat", NULL, NULL, FF_JNI_CLASS, offsetof(struct JNIAMediaFormatFields, clazz), 1 }, + { "android/media/MediaFormat", NULL, NULL, FF_JNI_CLASS, offsetof(struct JNIAMediaFormatFields, mediaformat_class), 1 }, { "android/media/MediaFormat", "<init>", "()V", FF_JNI_METHOD, offsetof(struct JNIAMediaFormatFields, init_id), 1 }, @@ -465,7 +465,7 @@ FFAMediaFormat *ff_AMediaFormat_new(void) goto fail; } - format->object = (*env)->NewObject(env, format->jfields.clazz, format->jfields.init_id); + format->object = (*env)->NewObject(env, format->jfields.mediaformat_class, format->jfields.init_id); if (!format->object) { goto fail; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
