diff options
author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-07-23 14:42:01 +0000 |
---|---|---|
committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-07-23 14:42:01 +0000 |
commit | 3dc26d2e5c5b360f844ea23c3f60ea4178f6f883 (patch) | |
tree | 2ddcbe47e8dd263197346d7fb523558455bef476 /unicode/src/media/UVideo.pas | |
parent | 94cefdb78044e0f9996e3032de34b690de98b708 (diff) | |
download | usdx-3dc26d2e5c5b360f844ea23c3f60ea4178f6f883.tar.gz usdx-3dc26d2e5c5b360f844ea23c3f60ea4178f6f883.tar.xz usdx-3dc26d2e5c5b360f844ea23c3f60ea4178f6f883.zip |
merge with current trunk revision 1827
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1855 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'unicode/src/media/UVideo.pas')
-rw-r--r-- | unicode/src/media/UVideo.pas | 6 |
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); |