diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2016-01-03 18:48:52 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2016-01-03 18:48:52 +0000 |
| commit | 5339826adf02204f8e3721578207aa2ad38e38c8 (patch) | |
| tree | 42de7e60c2131d7f960d9c96e6ff90cbbe232488 | |
| parent | 32f1bc3d4a1e74e2e3c0f3c48a616e2dc21b1ac6 (diff) | |
| download | usdx-5339826adf02204f8e3721578207aa2ad38e38c8.tar.gz usdx-5339826adf02204f8e3721578207aa2ad38e38c8.tar.xz usdx-5339826adf02204f8e3721578207aa2ad38e38c8.zip | |
adjust to github version. maybe fix avi file glitch.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3174 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | src/media/UVideo.pas | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/media/UVideo.pas b/src/media/UVideo.pas index 5512ee7b..4b680130 100644 --- a/src/media/UVideo.pas +++ b/src/media/UVideo.pas @@ -396,8 +396,9 @@ begin //fCodecContext^.error_resilience := FF_ER_CAREFUL; //FF_ER_COMPLIANT; // allow non spec compliant speedup tricks. - fCodecContext^.flags2 := CODEC_FLAG2_FAST; - fCodecContext^.flags := CODEC_FLAG_LOW_DELAY; + //fCodecContext^.flags2 := CODEC_FLAG2_FAST; + if not (FileName.GetExtension().ToUTF8() = '.avi' )then + fCodecContext^.flags := CODEC_FLAG_LOW_DELAY; //ffmpeg has a bug here when playing certain avi files // Note: avcodec_open() and avcodec_close() are not thread-safe and will // fail if called concurrently by different threads. @@ -538,7 +539,7 @@ begin glBindTexture(GL_TEXTURE_2D, fFrameTex); glTexImage2D(GL_TEXTURE_2D, 0, 3, fTexWidth, fTexHeight, 0, PIXEL_FMT_OPENGL, GL_UNSIGNED_BYTE, nil); - //glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); fOpened := true; |