ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Wed Mar 9 03:46:15 2016 +0100| [a008a7cc953e23193c91ececde3486e8a347c1ef] | committer: Michael Niedermayer
avcodec/ffjni: Fix occured typo Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a008a7cc953e23193c91ececde3486e8a347c1ef --- libavcodec/ffjni.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/ffjni.c b/libavcodec/ffjni.c index 19a4475..8333050 100644 --- a/libavcodec/ffjni.c +++ b/libavcodec/ffjni.c @@ -294,12 +294,12 @@ int ff_jni_exception_get_summary(JNIEnv *env, jthrowable exception, char **error if (name && message) { av_bprintf(&bp, "%s: %s", name, message); } else if (name && !message) { - av_bprintf(&bp, "%s occured", name); + av_bprintf(&bp, "%s occurred", name); } else if (!name && message) { av_bprintf(&bp, "Exception: %s", message); } else { av_log(log_ctx, AV_LOG_WARNING, "Could not retreive exception name and message\n"); - av_bprintf(&bp, "Exception occured"); + av_bprintf(&bp, "Exception occurred"); } ret = av_bprint_finalize(&bp, error); _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
