From 011198e5b6182245f05a15a8e85b7fde4c402e13 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 22 Apr 2012 13:31:47 +0000 Subject: updates and extension for ffmpeg-0.8 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2867 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-0.8/libavutil/dict.pas | 20 -------------------- src/lib/ffmpeg-0.8/libavutil/mathematics.pas | 21 --------------------- src/lib/ffmpeg-0.8/libavutil/mem.pas | 4 ++-- src/lib/ffmpeg-0.8/libavutil/opt.pas | 22 ---------------------- 4 files changed, 2 insertions(+), 65 deletions(-) (limited to 'src/lib/ffmpeg-0.8/libavutil') diff --git a/src/lib/ffmpeg-0.8/libavutil/dict.pas b/src/lib/ffmpeg-0.8/libavutil/dict.pas index b07ce6e8..d50d3b0b 100644 --- a/src/lib/ffmpeg-0.8/libavutil/dict.pas +++ b/src/lib/ffmpeg-0.8/libavutil/dict.pas @@ -23,22 +23,6 @@ * *) -unit dict; - -{$IFDEF FPC} - {$MODE DELPHI} - {$PACKENUM 4} (* use 4-byte enums *) - {$PACKRECORDS C} (* C/C++-compatible record packing *) -{$ELSE} - {$MINENUMSIZE 4} (* use 4-byte enums *) -{$ENDIF} - -interface - -uses - ctypes, - UConfig; - const AV_DICT_MATCH_CASE = 1; AV_DICT_IGNORE_SUFFIX = 2; @@ -103,7 +87,3 @@ procedure av_dict_copy(var dst: PAVDictionary; src: PAVDictionary; flags: cint); *) procedure av_dict_free(var m: PAVDictionary); cdecl; external av__util; - -implementation - -end. diff --git a/src/lib/ffmpeg-0.8/libavutil/mathematics.pas b/src/lib/ffmpeg-0.8/libavutil/mathematics.pas index 2f8eaab2..36768a55 100644 --- a/src/lib/ffmpeg-0.8/libavutil/mathematics.pas +++ b/src/lib/ffmpeg-0.8/libavutil/mathematics.pas @@ -26,23 +26,6 @@ * *) -unit mathematics; - -{$IFDEF FPC} - {$MODE DELPHI } - {$PACKENUM 4} (* use 4-byte enums *) - {$PACKRECORDS C} (* C/C++-compatible record packing *) -{$ELSE} - {$MINENUMSIZE 4} (* use 4-byte enums *) -{$ENDIF} - -interface - -uses - ctypes, - rational, - UConfig; - const M_E = 2.7182818284590452354; // e M_LN2 = 0.69314718055994530942; // log_e 2 @@ -113,7 +96,3 @@ function av_compare_ts(ts_a: cint64; tb_a: TAVRational; ts_b: cint64; tb_b: TAVR *) function av_compare_mod(a: cuint64; b: cuint64; modVar: cuint64): cint64; cdecl; external av__util; - -implementation - -end. diff --git a/src/lib/ffmpeg-0.8/libavutil/mem.pas b/src/lib/ffmpeg-0.8/libavutil/mem.pas index 322a8657..c438bbfc 100644 --- a/src/lib/ffmpeg-0.8/libavutil/mem.pas +++ b/src/lib/ffmpeg-0.8/libavutil/mem.pas @@ -101,10 +101,10 @@ function av_mallocz(size: size_t): pointer; * @param size * @return Pointer to the allocated block, NULL if it cannot be allocated. *) -{ available only in 0.8.5 - 0.8.10 +(* available only in 0.8.5 - 0.8.10 function av_calloc(nmemb: size_t; size: size_t): pointer; cdecl; external av__util; {av_malloc_attrib} -} +*) (** * Duplicate the string s. diff --git a/src/lib/ffmpeg-0.8/libavutil/opt.pas b/src/lib/ffmpeg-0.8/libavutil/opt.pas index c7b0d914..16bf0f26 100644 --- a/src/lib/ffmpeg-0.8/libavutil/opt.pas +++ b/src/lib/ffmpeg-0.8/libavutil/opt.pas @@ -27,24 +27,6 @@ * *) -unit opt; - -{$IFDEF FPC} - {$MODE DELPHI} - {$PACKENUM 4} (* use 4-byte enums *) - {$PACKRECORDS C} (* C/C++-compatible record packing *) -{$ELSE} - {$MINENUMSIZE 4} (* use 4-byte enums *) -{$ENDIF} - -interface - -uses - ctypes, - dict, - rational, - UConfig; - type TAVOptionType = ( FF_OPT_TYPE_FLAGS, @@ -275,7 +257,3 @@ const function av_opt_find(obj: pointer; name: {const} PAnsiChar; unit_: {const} PAnsiChar; opt_flags: cint; search_flags: cint): PAVOption; cdecl; external av__util; - -implementation - -end. -- cgit v1.2.3