diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-01-03 22:47:34 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-01-03 22:47:34 +0000 |
| commit | 08aa51105f881f912d7e4e4e4e083cb7732fd4b8 (patch) | |
| tree | 9292ef16ce4217cc60eef17d8b207196088553c5 /src | |
| parent | 3d1808b5ec93069182b730bb8ab826121ef1b78a (diff) | |
| download | usdx-08aa51105f881f912d7e4e4e4e083cb7732fd4b8.tar.gz usdx-08aa51105f881f912d7e4e4e4e083cb7732fd4b8.tar.xz usdx-08aa51105f881f912d7e4e4e4e083cb7732fd4b8.zip | |
merge with the patches of s_alexander from the new svn repository. prepare for second move to the new repository.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2932 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/ffmpeg-0.9/avcodec.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-0.9/avformat.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-0.9/avio.pas | 2 | ||||
| -rw-r--r-- | src/lib/ffmpeg-0.9/libavutil/opt.pas | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/ffmpeg-0.9/avcodec.pas b/src/lib/ffmpeg-0.9/avcodec.pas index 6a42c474..b00c7260 100644 --- a/src/lib/ffmpeg-0.9/avcodec.pas +++ b/src/lib/ffmpeg-0.9/avcodec.pas @@ -690,7 +690,7 @@ type AVCOL_TRC_UNSPECIFIED = 2, AVCOL_TRC_GAMMA22 = 4, ///< also ITU-R BT470M / ITU-R BT1700 625 PAL & SECAM AVCOL_TRC_GAMMA28 = 5, ///< also ITU-R BT470BG - AVCOL_SPC_SMPTE240M = 7, + AVCOL_TRC_SMPTE240M = 7, AVCOL_TRC_NB ///< Not part of ABI ); diff --git a/src/lib/ffmpeg-0.9/avformat.pas b/src/lib/ffmpeg-0.9/avformat.pas index f5951934..7cbdf9a0 100644 --- a/src/lib/ffmpeg-0.9/avformat.pas +++ b/src/lib/ffmpeg-0.9/avformat.pas @@ -462,7 +462,7 @@ type *) flags: cint; - dummy: pointer + dummy: pointer; interleave_packet: function (s: PAVFormatContext; out_: PAVPacket; in_: PAVPacket; flush: cint): cint; cdecl; diff --git a/src/lib/ffmpeg-0.9/avio.pas b/src/lib/ffmpeg-0.9/avio.pas index 1ce65826..166a600d 100644 --- a/src/lib/ffmpeg-0.9/avio.pas +++ b/src/lib/ffmpeg-0.9/avio.pas @@ -540,7 +540,7 @@ function url_exist(url: {const} PAnsiChar): cint; function avio_check(url: {const} PAnsiChar; flags: cint): cint; cdecl; external av__format; -{$IF FF_API_OLD_INTERRUPT_CB} +{$IFDEF FF_API_OLD_INTERRUPT_CB} (** * The callback is called in blocking functions to test regulary if * asynchronous interruption is needed. AVERROR_EXIT is returned diff --git a/src/lib/ffmpeg-0.9/libavutil/opt.pas b/src/lib/ffmpeg-0.9/libavutil/opt.pas index 6cf1fcfa..b51b744a 100644 --- a/src/lib/ffmpeg-0.9/libavutil/opt.pas +++ b/src/lib/ffmpeg-0.9/libavutil/opt.pas @@ -519,7 +519,7 @@ function av_opt_find(obj: pointer; name: {const} PAnsiChar; unit_: {const} PAnsi * @return A pointer to the option found, or NULL if no option * was found. *) -funtion av_opt_find2(obj: pointer; name: {const} PAnsiChar; unit: {const} PAnsiChar; +function av_opt_find2(obj: pointer; name: {const} PAnsiChar; unit_: {const} PAnsiChar; opt_flags: cint; search_flags: cint; target_obj: pointer): {const} PAVOption; cdecl; external av__util; @@ -532,7 +532,7 @@ funtion av_opt_find2(obj: pointer; name: {const} PAnsiChar; unit: {const} PAnsiC * or NULL * @return next AVOption or NULL *) -funtion av_opt_next(obj: pointer; prev: {const} PAVOption): {const} PAVOption; +function av_opt_next(obj: pointer; prev: {const} PAVOption): {const} PAVOption; cdecl; external av__util; (** |