From 87cdbb6f799eada3bc906158587b000ff0e909a1 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 28 Feb 2013 20:19:33 +0000
Subject: update opt.pas

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2958 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg-1.0/libavutil/opt.pas | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'src/lib/ffmpeg-1.0/libavutil/opt.pas')

diff --git a/src/lib/ffmpeg-1.0/libavutil/opt.pas b/src/lib/ffmpeg-1.0/libavutil/opt.pas
index 28e3b858..7e755942 100644
--- a/src/lib/ffmpeg-1.0/libavutil/opt.pas
+++ b/src/lib/ffmpeg-1.0/libavutil/opt.pas
@@ -23,7 +23,7 @@
  * - Changes and updates by the UltraStar Deluxe Team
  *
  * Conversion of libavutil/opt.h
- * avutil version 51.54.100
+ * avutil version 51.73.101
  *
  *)
 
@@ -48,7 +48,9 @@ type
     AV_OPT_TYPE_STRING,
     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_CONST = 128,
+    AV_OPT_TYPE_PIXEL_FMT  = $50464D54, ///< MKBETAG('P','F','M','T'),
+    AV_OPT_TYPE_IMAGE_SIZE = $53495A45  ///< MKBETAG('S','I','Z','E'), offset must point to two consecutive integers
 {$ENDIF}
   );
 
@@ -59,6 +61,7 @@ const
   AV_OPT_FLAG_AUDIO_PARAM     = 8;
   AV_OPT_FLAG_VIDEO_PARAM     = 16;
   AV_OPT_FLAG_SUBTITLE_PARAM  = 32;
+  AV_OPT_FLAG_FILTERING_PARAM = 1 shl 16; ///< a generic parameter which can be set by the user for filtering
 
 type
   (**
@@ -86,10 +89,10 @@ type
      *)
     default_val: record
       case cint of
-        0: (dbl: cdouble);
-        1: (str: PAnsiChar);
+        0: (i64: cint64);
+        1: (dbl: cdouble);
+        2: (str: PAnsiChar);
         (* TODO those are unused now *)
-        2: (i64: cint64);
         3: (q: TAVRational);
       end;
     min: cdouble;                ///< minimum valid value for the option
@@ -397,6 +400,8 @@ function av_opt_set_double(obj: pointer; name: {const} PAnsiChar; val: cdouble;
   cdecl; external av__util;
 function av_opt_set_q     (obj: pointer; name: {const} PAnsiChar; val: TAVRational;       search_flags: cint): cint;
   cdecl; external av__util;
+function av_opt_set_bin   (obj: pointer; name: {const} PAnsiChar; val: {const} cuint8;    search_flags: cint): cint;
+  cdecl; external av__util;
 (**
  * @}
  *)
-- 
cgit v1.2.3