another ffmpeg sync to include h264 security fixes

CVS patchset: 8573
CVS date: 2007/01/28 18:38:32

1 files changed, 40 insertions, 0 deletions

diff --git a/src/libffmpeg/libavutil/log.h b/src/libffmpeg/libavutil/log.h
index 0ff1f9fcf..56ca01289 100644
--- a/src/libffmpeg/libavutil/log.h
+++ b/src/libffmpeg/libavutil/log.h
@@ -38,10 +38,49 @@ struct AVCLASS {
 
 /* av_log API */
 
+#if LIBAVUTIL_VERSION_INT < (50<<16)
 #define AV_LOG_QUIET -1
+#define AV_LOG_FATAL 0
 #define AV_LOG_ERROR 0
+#define AV_LOG_WARNING 1
 #define AV_LOG_INFO 1
+#define AV_LOG_VERBOSE 1
 #define AV_LOG_DEBUG 2
+#else
+#define AV_LOG_QUIET    -8
+
+/**
+ * something went really wrong and we will crash now
+ */
+#define AV_LOG_PANIC     0
+
+/**
+ * something went wrong and recovery is not possible
+ * like no header in a format which depends on it or a combination
+ * of parameters which are not allowed
+ */
+#define AV_LOG_FATAL     8
+
+/**
+ * something went wrong and cannot losslessly be recovered
+ * but not all future data is affected
+ */
+#define AV_LOG_ERROR    16
+
+/**
+ * something somehow does not look correct / something which may or may not
+ * lead to some problems like use of -vstrict -2
+ */
+#define AV_LOG_WARNING  24
+
+#define AV_LOG_INFO     32
+#define AV_LOG_VERBOSE  40
+
+/**
+ * stuff which is only useful for libav* developers
+ */
+#define AV_LOG_DEBUG    48
+#endif
 extern int av_log_level;
 
 #ifdef __GNUC__
@@ -55,6 +94,7 @@ extern void av_vlog(void*, int level, const char *fmt, va_list);
 extern int av_log_get_level(void);
 extern void av_log_set_level(int);
 extern void av_log_set_callback(void (*)(void*, int, const char*, va_list));
+extern void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
 #else
 extern void (*av_vlog)(void*, int, const char*, va_list);
 #endif