diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-06-09 11:15:48 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-06-09 11:15:48 +0000 |
| commit | 5d1d06acda578ffcfa6beb3bc5876ad332110dfc (patch) | |
| tree | 2d6bfb83ce36ac63f4fe6aaee416fa24f3031341 /src/lib/ffmpeg-0.10/libavutil/opt.pas | |
| parent | 829b0bb438e104b35d3deb461bcc02e9225dc2aa (diff) | |
| download | usdx-5d1d06acda578ffcfa6beb3bc5876ad332110dfc.tar.gz usdx-5d1d06acda578ffcfa6beb3bc5876ad332110dfc.tar.xz usdx-5d1d06acda578ffcfa6beb3bc5876ad332110dfc.zip | |
update and additions to ffmpeg-0.10
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2892 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | src/lib/ffmpeg-0.10/libavutil/opt.pas | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/lib/ffmpeg-0.10/libavutil/opt.pas b/src/lib/ffmpeg-0.10/libavutil/opt.pas index 16bf0f26..f2c258de 100644 --- a/src/lib/ffmpeg-0.10/libavutil/opt.pas +++ b/src/lib/ffmpeg-0.10/libavutil/opt.pas @@ -23,13 +23,14 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/opt.h - * avutil version 51.9.1 + * avutil version 51.34.101 * *) type TAVOptionType = ( - FF_OPT_TYPE_FLAGS, +{$IFDEF FF_API_OLD_AVOPTIONS} + FF_OPT_TYPE_FLAGS = 0, FF_OPT_TYPE_INT, FF_OPT_TYPE_INT64, FF_OPT_TYPE_DOUBLE, @@ -38,6 +39,17 @@ type FF_OPT_TYPE_RATIONAL, FF_OPT_TYPE_BINARY, ///< offset must point to a pointer immediately followed by an int for the length FF_OPT_TYPE_CONST = 128 +{$ELSE} + AV_OPT_TYPE_FLAGS, + AV_OPT_TYPE_INT, + AV_OPT_TYPE_INT64, + AV_OPT_TYPE_DOUBLE, + AV_OPT_TYPE_FLOAT, + 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 +{$ENDIF} ); const |