From 829b0bb438e104b35d3deb461bcc02e9225dc2aa Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Thu, 24 May 2012 11:09:39 +0000 Subject: make avio_tell unix only, because of SEEK_CUR git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2891 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-0.10/avio.pas | 6 ++++++ src/lib/ffmpeg-0.7/avio.pas | 6 ++++++ src/lib/ffmpeg-0.8/avio.pas | 6 ++++++ 3 files changed, 18 insertions(+) (limited to 'src') diff --git a/src/lib/ffmpeg-0.10/avio.pas b/src/lib/ffmpeg-0.10/avio.pas index 30d82f82..9cdc1520 100644 --- a/src/lib/ffmpeg-0.10/avio.pas +++ b/src/lib/ffmpeg-0.10/avio.pas @@ -647,11 +647,14 @@ function avio_seek(s: PAVIOContext; offset: cint64; whence: cint): cint64; function avio_skip(s: PAVIOContext; offset: cint64): cint64; cdecl; external av__format; +{$IFDEF UNIX} (** * ftell() equivalent for AVIOContext. * @return position or AVERROR. *) function avio_tell(s: PAVIOContext): cint64; {$IFDEF HasInline}inline;{$ENDIF} +{$ELSE} +{$ENDIF} (** * Get the filesize. @@ -894,9 +897,12 @@ begin end; {$ENDIF} +{$IFDEF UNIX} function avio_tell(s: PAVIOContext): cint64; {$IFDEF HasInline}inline;{$ENDIF} begin Result := avio_seek(s, 0, SEEK_CUR); end; +{$ELSE} +{$ENDIF} end. diff --git a/src/lib/ffmpeg-0.7/avio.pas b/src/lib/ffmpeg-0.7/avio.pas index 0aa9dc77..ad3c8c80 100644 --- a/src/lib/ffmpeg-0.7/avio.pas +++ b/src/lib/ffmpeg-0.7/avio.pas @@ -630,11 +630,14 @@ function avio_seek(s: PAVIOContext; offset: cint64; whence: cint): cint64; function avio_skip(s: PAVIOContext; offset: cint64): cint64; cdecl; external av__format; +{$IFDEF UNIX} (** * ftell() equivalent for AVIOContext. * @return position or AVERROR. *) function avio_tell(s: PAVIOContext): cint64; {$IFDEF HasInline}inline;{$ENDIF} +{$ELSE} +{$ENDIF} (** * Get the filesize. @@ -881,9 +884,12 @@ begin end; {$ENDIF} +{$IFDEF UNIX} function avio_tell(s: PAVIOContext): cint64; {$IFDEF HasInline}inline;{$ENDIF} begin Result := avio_seek(s, 0, SEEK_CUR); end; +{$ELSE} +{$ENDIF} end. diff --git a/src/lib/ffmpeg-0.8/avio.pas b/src/lib/ffmpeg-0.8/avio.pas index d9716b4c..99725ec3 100644 --- a/src/lib/ffmpeg-0.8/avio.pas +++ b/src/lib/ffmpeg-0.8/avio.pas @@ -605,11 +605,14 @@ function avio_seek(s: PAVIOContext; offset: cint64; whence: cint): cint64; function avio_skip(s: PAVIOContext; offset: cint64): cint64; cdecl; external av__format; +{$IFDEF UNIX} (** * ftell() equivalent for AVIOContext. * @return position or AVERROR. *) function avio_tell(s: PAVIOContext): cint64; {$IFDEF HasInline}inline;{$ENDIF} +{$ELSE} +{$ENDIF} (** * Get the filesize. @@ -832,9 +835,12 @@ begin end; {$ENDIF} +{$IFDEF UNIX} function avio_tell(s: PAVIOContext): cint64; {$IFDEF HasInline}inline;{$ENDIF} begin Result := avio_seek(s, 0, SEEK_CUR); end; +{$ELSE} +{$ENDIF} end. -- cgit v1.2.3