aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ffmpeg-2.2/libavutil/log.pas
diff options
context:
space:
mode:
authorbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2014-06-16 00:40:08 +0000
committerbrian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c>2014-06-16 00:40:08 +0000
commit5b78c67260c14642ca29844750752ac2aa9d8333 (patch)
treef792a0a4ebca0f281d116c877e75b25727b71ad9 /src/lib/ffmpeg-2.2/libavutil/log.pas
parent167220739fc0b7506ee87c51696d259e95c2b0ed (diff)
downloadusdx-5b78c67260c14642ca29844750752ac2aa9d8333.tar.gz
usdx-5b78c67260c14642ca29844750752ac2aa9d8333.tar.xz
usdx-5b78c67260c14642ca29844750752ac2aa9d8333.zip
Update libavutil files for ffmpeg 2.2
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3073 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg-2.2/libavutil/log.pas29
1 files changed, 20 insertions, 9 deletions
diff --git a/src/lib/ffmpeg-2.2/libavutil/log.pas b/src/lib/ffmpeg-2.2/libavutil/log.pas
index 8bcc95bf..e47cfc19 100644
--- a/src/lib/ffmpeg-2.2/libavutil/log.pas
+++ b/src/lib/ffmpeg-2.2/libavutil/log.pas
@@ -19,7 +19,7 @@
* - Changes and updates by the UltraStar Deluxe Team
*
* Conversion of libavutil/log.h
- * avutil version 52.38.100
+ * avutil version 52.66.100
*
*)
@@ -50,23 +50,34 @@ type
AV_OPT_TYPE_RATIONAL,
AV_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length
AV_OPT_TYPE_CONST = 128,
- AV_OPT_TYPE_CHANNEL_LAYOUT = $43484C41, ///< MKBETAG('C','H','L','A'),
- AV_OPT_TYPE_COLOR = $434F4C52, ///< MKBETAG('C','O','L','R'),
+ AV_OPT_TYPE_IMAGE_SIZE = $53495A45, ///< MKBETAG('S','I','Z','E'), offset must point to two consecutive integers
+ AV_OPT_TYPE_PIXEL_FMT = $50464D54, ///< MKBETAG('P','F','M','T')
+ AV_OPT_TYPE_SAMPLE_FMT = $53464D54, ///< MKBETAG('S','F','M','T')
+ AV_OPT_TYPE_VIDEO_RATE = $56524154 ///< MKBETAG('V','R','A','T'), offset must point to TAVRational
AV_OPT_TYPE_DURATION = $44555220, ///< MKBETAG('D','U','R',' '),
- AV_OPT_TYPE_PIXEL_FMT = $50464D54, ///< MKBETAG('P','F','M','T')
- AV_OPT_TYPE_SAMPLE_FMT = $53464D54, ///< MKBETAG('S','F','M','T')
- AV_OPT_TYPE_IMAGE_SIZE = $53495A45, ///< MKBETAG('S','I','Z','E'), offset must point to two consecutive integers
- AV_OPT_TYPE_VIDEO_RATE = $56524154 ///< MKBETAG('V','R','A','T'), offset must point to TAVRational
+ AV_OPT_TYPE_COLOR = $434F4C52, ///< MKBETAG('C','O','L','R'),
+ AV_OPT_TYPE_CHANNEL_LAYOUT = $43484C41, ///< MKBETAG('C','H','L','A'),
{$ENDIF}
);
const
AV_OPT_FLAG_ENCODING_PARAM = 1; ///< a generic parameter which can be set by the user for muxing or encoding
AV_OPT_FLAG_DECODING_PARAM = 2; ///< a generic parameter which can be set by the user for demuxing or decoding
+{$IFDEF FF_API_OPT_TYPE_METADATA}
AV_OPT_FLAG_METADATA = 4; ///< some data extracted or inserted into the file like title, comment, ...
+{$ENDIF}
AV_OPT_FLAG_AUDIO_PARAM = 8;
AV_OPT_FLAG_VIDEO_PARAM = 16;
AV_OPT_FLAG_SUBTITLE_PARAM = 32;
+ (**
+ * The option is inteded for exporting values to the caller.
+ *)
+ AV_OPT_FLAG_EXPORT = 64;
+ (**
+ * The option may not be set through the AVOptions API, only read.
+ * This flag only makes sense when AV_OPT_FLAG_EXPORT is also set.
+ *)
+ AV_OPT_FLAG_READONLY = 128;
AV_OPT_FLAG_FILTERING_PARAM = 1 shl 16; ///< a generic parameter which can be set by the user for filtering
type
@@ -370,10 +381,10 @@ void av_log_set_callback(void (*callback)(void*, int, const char*, va_list));
* lavu_log_constants "Logging Constant".
* @param fmt The format string (printf-compatible) that specifies how
* subsequent arguments are converted to output.
- * @param ap The arguments referenced by the format string.
+ * @param vl The arguments referenced by the format string.
*)
{** to be translated if needed
-void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl);
+void av_log_default_callback(void* avcl, int level, const char *fmt, va_list vl);
**}
(**