split log.pas, so that PAVClass is defined in opt.pas

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2988 b956fd51-792f-4845-bead-9b4dfca2ff2c

3 files changed, 141 insertions, 1 deletions

diff --git a/src/lib/ffmpeg-0.9/avutil.pas b/src/lib/ffmpeg-0.9/avutil.pas
index fc3cdd24..2ae39b82 100644
--- a/src/lib/ffmpeg-0.9/avutil.pas
+++ b/src/lib/ffmpeg-0.9/avutil.pas
@@ -202,10 +202,12 @@ function av_x_if_null(p: {const} pointer; x: {const} pointer): pointer; {$IFDEF
 
 {$INCLUDE libavutil/mem.pas}
 
-{$INCLUDE libavutil/log.pas}
+{$INCLUDE libavutil/log1.pas}
 
 {$INCLUDE libavutil/opt.pas}
 
+{$INCLUDE libavutil/log2.pas}
+
 {$INCLUDE libavutil/pixfmt.pas}
 
 {$INCLUDE libavutil/samplefmt.pas}
diff --git a/src/lib/ffmpeg-0.9/libavutil/log.pas b/src/lib/ffmpeg-0.9/libavutil/log1.pas
index b60d6731..b60d6731 100644
--- a/src/lib/ffmpeg-0.9/libavutil/log.pas
+++ b/src/lib/ffmpeg-0.9/libavutil/log1.pas
diff --git a/src/lib/ffmpeg-0.9/libavutil/log2.pas b/src/lib/ffmpeg-0.9/libavutil/log2.pas
new file mode 100644
index 00000000..6ca978f3
--- /dev/null
+++ b/src/lib/ffmpeg-0.9/libavutil/log2.pas
@@ -0,0 +1,138 @@
+(*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * This is a part of the Pascal port of ffmpeg.
+ * - Changes and updates by the UltraStar Deluxe Team
+ *
+ * Conversion of libavutil/log.h
+ * avutil version 51.32.0
+ *
+ *)
+
+(**
+ * @file
+ * log
+ *)
+
+const
+  AV_LOG_QUIET   = -8;
+
+(**
+ * Something went really wrong and we will crash now.
+ *)
+  AV_LOG_PANIC   =  0;
+
+(**
+ * Something went wrong and recovery is not possible.
+ * For example, no header was found for a format which depends
+ * on headers or an illegal combination of parameters is used.
+ *)
+  AV_LOG_FATAL   =  8;
+
+(**
+ * Something went wrong and cannot losslessly be recovered.
+ * However, not all future data is affected.
+ *)
+  AV_LOG_ERROR   = 16;
+
+(**
+ * Something somehow does not look correct. This may or may not
+ * lead to problems. An example would be the use of '-vstrict -2'.
+ *)
+  AV_LOG_WARNING = 24;
+
+  AV_LOG_INFO    = 32;
+  AV_LOG_VERBOSE = 40;
+
+(**
+ * Stuff which is only useful for libav* developers.
+ *)
+  AV_LOG_DEBUG   = 48;
+
+(**
+ * Send the specified message to the log if the level is less than or equal
+ * to the current av_log_level. By default, all logging messages are sent to
+ * stderr. This behavior can be altered by setting a different av_vlog callback
+ * function.
+ *
+ * @param avcl A pointer to an arbitrary struct of which the first field is a
+ * pointer to an AVClass struct.
+ * @param level The importance level of the message, lower values signifying
+ * higher importance.
+ * @param fmt The format string (printf-compatible) that specifies how
+ * subsequent arguments are converted to output.
+ * @see av_vlog
+ *)
+
+{** to be translated if needed
+void av_log(void *avcl, int level, const char *fmt, ...) av_printf_format(3, 4);
+**}
+
+type
+  va_list = pointer;
+
+procedure av_vlog(avcl: pointer; level: cint; fmt: {const} PAnsiChar; dummy: va_list);
+  cdecl; external av__util;
+function av_log_get_level(): cint;
+  cdecl; external av__util;
+procedure av_log_set_level(level: cint);
+  cdecl; external av__util;
+
+{** to be translated if needed
+void av_log_set_callback(void (*)(void*, int, const char*, va_list));
+void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
+**}
+
+function av_default_item_name (ctx: pointer): PAnsiChar;
+  cdecl; external av__util;
+
+(**
+ * Format a line of log the same way as the default callback.
+ * @param line          buffer to receive the formated line
+ * @param line_size     size of the buffer
+ * @param print_prefix  used to store whether the prefix must be printed;
+ *                      must point to a persistent integer initially set to 1
+ *)
+procedure av_log_format_line(ptr: pointer; level: cint; fmt: {const} PAnsiChar; vl: va_list;
+                        line: PAnsiChar; line_size: cint; print_prefix: Pcint);
+  cdecl; external av__util;
+
+(**
+ * av_dlog macros
+ * Useful to print debug messages that shouldn't get compiled in normally.
+ *)
+(** to be translated if needed
+#ifdef DEBUG
+#    define av_dlog(pctx, ...) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__)
+#else
+#    define av_dlog(pctx, ...) do { if (0) av_log(pctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
+#endif
+**)
+
+(**
+ * Skip repeated messages, this requires the user app to use av_log() instead of
+ * (f)printf as the 2 would otherwise interfere and lead to
+ * "Last message repeated x times" messages below (f)printf messages with some
+ * bad luck.
+ * Also to receive the last, "last repeated" line if any, the user app must
+ * call av_log(NULL, AV_LOG_QUIET, "%s", ""); at the end
+ *)
+const
+  AV_LOG_SKIP_REPEATED = 1;
+
+procedure av_log_set_flags(arg: cint);
+  cdecl; external av__util;