aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2014-03-15 14:24:14 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2014-03-15 14:24:14 +0000
commit8c30f8b2ceb95e1286c76e162913042e08df0996 (patch)
treecd39e0d60e02f7aedc131fb1e0918bfb4dbc0c70 /src/lib
parenta7831486a4bbd6710fdfcea7e7236b38335f8b2b (diff)
downloadusdx-8c30f8b2ceb95e1286c76e162913042e08df0996.tar.gz
usdx-8c30f8b2ceb95e1286c76e162913042e08df0996.tar.xz
usdx-8c30f8b2ceb95e1286c76e162913042e08df0996.zip
fix compilation of ffmpeg-1.1. cosmetics in ffmpeg-1.2
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3069 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg-1.1/avformat.pas2
-rw-r--r--src/lib/ffmpeg-1.1/libavutil/log.pas22
-rw-r--r--src/lib/ffmpeg-1.1/libavutil/opt.pas2
-rw-r--r--src/lib/ffmpeg-1.2/libavutil/opt.pas2
4 files changed, 25 insertions, 3 deletions
diff --git a/src/lib/ffmpeg-1.1/avformat.pas b/src/lib/ffmpeg-1.1/avformat.pas
index 6ed9ec63..2229c20b 100644
--- a/src/lib/ffmpeg-1.1/avformat.pas
+++ b/src/lib/ffmpeg-1.1/avformat.pas
@@ -1139,7 +1139,7 @@ type
* iformat/oformat.flags. In such a case, the (de)muxer will handle
* I/O in some other way and this field will be NULL.
*)
- pb: PByteIOContext;
+ pb: PAVIOContext;
(* stream info *)
ctx_flags: cint; (**< Format-specific flags, see AVFMTCTX_xx *)
diff --git a/src/lib/ffmpeg-1.1/libavutil/log.pas b/src/lib/ffmpeg-1.1/libavutil/log.pas
index 9ad35369..de110bd2 100644
--- a/src/lib/ffmpeg-1.1/libavutil/log.pas
+++ b/src/lib/ffmpeg-1.1/libavutil/log.pas
@@ -129,6 +129,28 @@ type
// struct AVOptionRanges;
+ (**
+ * A single allowed range of values, or a single allowed value.
+ *)
+ PAVOptionRange = ^TAVOptionRange;
+ PPAVOptionRange = ^PAVOptionRange;
+ TAVOptionRange = record
+ str: {const} PAnsiChar;
+ value_min, value_max: cdouble; ///< For string ranges this represents the min/max length, for dimensions this represents the min/max pixel count
+ component_min, component_max: cdouble; ///< For string this represents the unicode range for chars, 0-127 limits to ASCII
+ is_range: cint; ///< if set to 1 the struct encodes a range, if set to 0 a single value
+ end;
+
+ (**
+ * List of AVOptionRange structs
+ *)
+ PAVOptionRanges = ^TAVOptionRanges;
+ PPAVOptionRanges = ^PAVOptionRanges;
+ TAVOptionRanges = record
+ range: PPAVOptionRange;
+ nb_ranges: cint;
+ end;
+
(**
* Describe the class of an AVClass context structure. That is an
* arbitrary struct of which the first field is a pointer to an
diff --git a/src/lib/ffmpeg-1.1/libavutil/opt.pas b/src/lib/ffmpeg-1.1/libavutil/opt.pas
index 60ba821a..045b348d 100644
--- a/src/lib/ffmpeg-1.1/libavutil/opt.pas
+++ b/src/lib/ffmpeg-1.1/libavutil/opt.pas
@@ -264,7 +264,7 @@ function av_opt_eval_q (obj: pointer; o: {const} PAVOption; val: {const} PAn
* @}
*)
- const
+const
AV_OPT_SEARCH_CHILDREN = 0001; (**< Search in possible children of the
given object first.*)
(**
diff --git a/src/lib/ffmpeg-1.2/libavutil/opt.pas b/src/lib/ffmpeg-1.2/libavutil/opt.pas
index b477cb50..b805fd81 100644
--- a/src/lib/ffmpeg-1.2/libavutil/opt.pas
+++ b/src/lib/ffmpeg-1.2/libavutil/opt.pas
@@ -269,7 +269,7 @@ function av_opt_eval_q (obj: pointer; o: {const} PAVOption; val: {const} PAn
* @}
*)
- const
+const
AV_OPT_SEARCH_CHILDREN = 0001; (**< Search in possible children of the
given object first.*)
(**