aboutsummaryrefslogtreecommitdiffstats
path: root/src/media
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-12-14 23:52:28 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-12-14 23:52:28 +0000
commit1024bab19b989a6ad549e835cfb1186068904fcf (patch)
treec35967bd16112348bd8fde6fcb552755f6a3ee93 /src/media
parentd99a89b60c91b7630ed47f9df67beae41ea65892 (diff)
downloadusdx-1024bab19b989a6ad549e835cfb1186068904fcf.tar.gz
usdx-1024bab19b989a6ad549e835cfb1186068904fcf.tar.xz
usdx-1024bab19b989a6ad549e835cfb1186068904fcf.zip
fix PByteIOContext for ffmpeg-1.2. ffmpeg-0.8 works. ffmpeg-1.2 compiles but no audio and then crashes.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3026 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/media/UAudioDecoder_FFmpeg.pas4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/media/UAudioDecoder_FFmpeg.pas b/src/media/UAudioDecoder_FFmpeg.pas
index 7d62d761..0cdf9555 100644
--- a/src/media/UAudioDecoder_FFmpeg.pas
+++ b/src/media/UAudioDecoder_FFmpeg.pas
@@ -690,7 +690,11 @@ function TFFmpegDecodeStream.ParseLoop(): boolean;
var
Packet: TAVPacket;
SeekTarget: int64;
+ {$IF FFMPEG_VERSION_INT < 1001000}
ByteIOCtx: PByteIOContext;
+ {$ELSE}
+ ByteIOCtx: PAVIOContext;
+ {$ENDIF}
ErrorCode: integer;
StartSilence: double; // duration of silence at start of stream
StartSilencePtr: PDouble; // pointer for the EMPTY status packet