aboutsummaryrefslogtreecommitdiffstats
path: root/unicode/src/media/UVideo.pas
diff options
context:
space:
mode:
authors_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-06-27 21:40:55 +0000
committers_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-06-27 21:40:55 +0000
commit544d6b5d3ebc527245d20542b6130baef315b715 (patch)
tree9740736457682af175aa4b4d46d1927e3ee04cd9 /unicode/src/media/UVideo.pas
parent23b9720e7395f517e8fc38faabc7fd825d9ee33c (diff)
downloadusdx-544d6b5d3ebc527245d20542b6130baef315b715.tar.gz
usdx-544d6b5d3ebc527245d20542b6130baef315b715.tar.xz
usdx-544d6b5d3ebc527245d20542b6130baef315b715.zip
merged r1830 trunk (current) in this branch
add some files to svn:ignore git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1831 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'unicode/src/media/UVideo.pas')
-rw-r--r--unicode/src/media/UVideo.pas6
1 files changed, 6 insertions, 0 deletions
diff --git a/unicode/src/media/UVideo.pas b/unicode/src/media/UVideo.pas
index 35f8ab4d..f55690b2 100644
--- a/unicode/src/media/UVideo.pas
+++ b/unicode/src/media/UVideo.pas
@@ -697,6 +697,12 @@ begin
0, fCodecContext^.Height,
@(fAVFrameRGB.data), @(fAVFrameRGB.linesize));
{$ELSE}
+ // img_convert from lib/ffmpeg/avcodec.pas is actually deprecated.
+ // If ./configure does not find SWScale then this gives the error
+ // that the identifier img_convert is not known or similar.
+ // I think this should be removed, but am not sure whether there should
+ // be some other replacement or a warning, Therefore, I leave it for now.
+ // April 2009, mischi
errnum := img_convert(PAVPicture(fAVFrameRGB), PIXEL_FMT_FFMPEG,
PAVPicture(fAVFrame), fCodecContext^.pix_fmt,
fCodecContext^.width, fCodecContext^.height);