aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ffmpeg
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-07-09 22:17:38 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-07-09 22:17:38 +0000
commitcd9b347aa57e1c55d72246a4fb86ab5c5c0976ca (patch)
tree6b49d8edc310788867cffe39e8146167a572d531 /src/lib/ffmpeg
parentfd5e68950096cf839e30a8f52eadb1e91e399fef (diff)
downloadusdx-cd9b347aa57e1c55d72246a4fb86ab5c5c0976ca.tar.gz
usdx-cd9b347aa57e1c55d72246a4fb86ab5c5c0976ca.tar.xz
usdx-cd9b347aa57e1c55d72246a4fb86ab5c5c0976ca.zip
replace << and >> by shl and shr. makes Delphi happy.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2906 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg-0.10/avutil.pas2
-rw-r--r--src/lib/ffmpeg-0.10/rational.pas4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/ffmpeg-0.10/avutil.pas b/src/lib/ffmpeg-0.10/avutil.pas
index 8da705df..448d00e9 100644
--- a/src/lib/ffmpeg-0.10/avutil.pas
+++ b/src/lib/ffmpeg-0.10/avutil.pas
@@ -121,7 +121,7 @@ function av_get_media_type_string(media_type: TAVMediaType): PAnsiChar;
const
FF_LAMBDA_SHIFT = 7;
- FF_LAMBDA_SCALE = (1<<FF_LAMBDA_SHIFT);
+ FF_LAMBDA_SCALE = (1 shl FF_LAMBDA_SHIFT);
FF_QP2LAMBDA = 118; ///< factor to convert from H.263 QP to lambda
FF_LAMBDA_MAX = (256*128-1);
diff --git a/src/lib/ffmpeg-0.10/rational.pas b/src/lib/ffmpeg-0.10/rational.pas
index c0d76168..63c47c9d 100644
--- a/src/lib/ffmpeg-0.10/rational.pas
+++ b/src/lib/ffmpeg-0.10/rational.pas
@@ -175,11 +175,11 @@ begin
}
if tmp <> 0 then
- Result := ((tmp xor a.den xor b.den) >> 63) or 1
+ Result := ((tmp xor a.den xor b.den) shr 63) or 1
else if (b.den and a.den) <> 0 then
Result := 0
else if (a.num and b.num) <> 0 then
- Result := (a.num >> 31) - (b.num >> 31)
+ Result := (a.num shr 31) - (b.num shr 31)
else
Result := low(cint);