From: Reimar Döffinger Date: Mon, 3 Dec 2012 19:42:08 +0000 (+0100) Subject: av_assert should use AV_LOG_PANIC. X-Git-Tag: android-x86-4.4-r1~7480 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=58df8befda61c8e984a3f55f7f5abc454055f893;p=android-x86%2Fexternal-ffmpeg.git av_assert should use AV_LOG_PANIC. The description of AV_LOG_PANIC 100% matches what av_assert does, while AV_LOG_FATAL does not really. Signed-off-by: Reimar Döffinger --- diff --git a/libavutil/avassert.h b/libavutil/avassert.h index e100d0bfdd..41f5e0eea7 100644 --- a/libavutil/avassert.h +++ b/libavutil/avassert.h @@ -36,7 +36,7 @@ */ #define av_assert0(cond) do { \ if (!(cond)) { \ - av_log(NULL, AV_LOG_FATAL, "Assertion %s failed at %s:%d\n", \ + av_log(NULL, AV_LOG_PANIC, "Assertion %s failed at %s:%d\n", \ AV_STRINGIFY(cond), __FILE__, __LINE__); \ abort(); \ } \ diff --git a/libavutil/version.h b/libavutil/version.h index a44feda847..1724369a3e 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -76,7 +76,7 @@ #define LIBAVUTIL_VERSION_MAJOR 52 #define LIBAVUTIL_VERSION_MINOR 11 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MICRO 102 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \