aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-05-24 11:09:39 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-05-24 11:09:39 +0000
commit829b0bb438e104b35d3deb461bcc02e9225dc2aa (patch)
tree35ea07ad2a60bd50ffa3ee573087720eff937810 /src
parent1c7029d9de106f5c8ffe5a5dbdafbede86344cfe (diff)
downloadusdx-829b0bb438e104b35d3deb461bcc02e9225dc2aa.tar.gz
usdx-829b0bb438e104b35d3deb461bcc02e9225dc2aa.tar.xz
usdx-829b0bb438e104b35d3deb461bcc02e9225dc2aa.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/ffmpeg-0.10/avio.pas6
-rw-r--r--src/lib/ffmpeg-0.7/avio.pas6
-rw-r--r--src/lib/ffmpeg-0.8/avio.pas6
3 files changed, 18 insertions, 0 deletions
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.