diff options
| author | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-12-26 13:05:20 +0000 |
|---|---|---|
| committer | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-12-26 13:05:20 +0000 |
| commit | 09bcce93209367313744817790b4309e1071ee8e (patch) | |
| tree | 750c3009c426f9c6d2bd131a2727f93e448805a5 /src/media | |
| parent | e5c4702b329953fa78e740072e812cdabb4632e6 (diff) | |
| download | usdx-09bcce93209367313744817790b4309e1071ee8e.tar.gz usdx-09bcce93209367313744817790b4309e1071ee8e.tar.xz usdx-09bcce93209367313744817790b4309e1071ee8e.zip | |
Fix in avformat defines and a small fix in UAudioDecoder_FFmpeg
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3060 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/media')
| -rw-r--r-- | src/media/UAudioDecoder_FFmpeg.pas | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/media/UAudioDecoder_FFmpeg.pas b/src/media/UAudioDecoder_FFmpeg.pas index 4d02c260..75bfa75b 100644 --- a/src/media/UAudioDecoder_FFmpeg.pas +++ b/src/media/UAudioDecoder_FFmpeg.pas @@ -80,7 +80,11 @@ const const // TODO: The factor 3/2 might not be necessary as we do not need extra // space for synchronizing as in the tutorial. +{$IF FFMPEG_VERSION_INT >= 2000000} + AUDIO_BUFFER_SIZE = (192000 * 3) div 2; +{$ELSE} AUDIO_BUFFER_SIZE = (AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) div 2; +{$ENDIF} type TFFmpegDecodeStream = class(TAudioDecodeStream) |