aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbasisbit <basisbit@b956fd51-792f-4845-bead-9b4dfca2ff2c>2015-09-04 23:42:54 +0000
committerbasisbit <basisbit@b956fd51-792f-4845-bead-9b4dfca2ff2c>2015-09-04 23:42:54 +0000
commita1cc9838fa20ec350c06534ce34b493fdc9fbb6d (patch)
treef53ecee51bd9a954f80288edead5a382d4ccbd97 /src
parent6ff85ad711a5ff263563ea3fa922a7206235cae3 (diff)
downloadusdx-a1cc9838fa20ec350c06534ce34b493fdc9fbb6d.tar.gz
usdx-a1cc9838fa20ec350c06534ce34b493fdc9fbb6d.tar.xz
usdx-a1cc9838fa20ec350c06534ce34b493fdc9fbb6d.zip
* fix end of file detection for videos with current ffmpeg versions
* improve error text information of function TVideo_FFmpeg.DecodeFrame() git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3130 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
-rw-r--r--src/media/UVideo.pas7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/media/UVideo.pas b/src/media/UVideo.pas
index 7a3d066b..b8bd14a0 100644
--- a/src/media/UVideo.pas
+++ b/src/media/UVideo.pas
@@ -720,9 +720,14 @@ begin
fEOF := true;
Exit;
end;
+ if (errnum = -541478725) then // LIBAVFORMAT_VERSION >= 56000000 tells us if EOF reached.
+ begin
+ fEOF := true;
+ Exit
+ end;
// error occured, log and exit
- Log.LogError('Video decoding error', 'TVideoPlayback_FFmpeg.DecodeFrame');
+ Log.LogError('Video decoding error: ' + IntToStr(errnum), 'TVideoPlayback_FFmpeg.DecodeFrame');
Exit;
end;