aboutsummaryrefslogtreecommitdiffstats
path: root/src
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
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 'src')
-rw-r--r--src/config-darwin.inc3
-rw-r--r--src/config.inc.in1
-rw-r--r--src/media/UAudioDecoder_FFmpeg.pas4
3 files changed, 8 insertions, 0 deletions
diff --git a/src/config-darwin.inc b/src/config-darwin.inc
index eff33d4f..edfceb47 100644
--- a/src/config-darwin.inc
+++ b/src/config-darwin.inc
@@ -20,12 +20,15 @@
{$IFNDEF FFMPEG_DIR}
{$IF (8 > 0) or (0 > 0)}
{$DEFINE FFMPEG_DIR := 'ffmpeg-0.8'}
+ {$DEFINE FF_API_OLD_DECODE_AUDIO}
{$ELSE}
{$DEFINE FFMPEG_DIR := 'ffmpeg'}
{$DEFINE useOLD_FFMPEG}
{$IFEND}
{$ENDIF}
{$IF Defined(IncludeConstants)}
+ FFMPEG_VERSION_INT = 8000;
+
av__codec = 'libavcodec';
LIBAVCODEC_VERSION_MAJOR = 53;
LIBAVCODEC_VERSION_MINOR = 8;
diff --git a/src/config.inc.in b/src/config.inc.in
index 97b0f604..967612a4 100644
--- a/src/config.inc.in
+++ b/src/config.inc.in
@@ -20,6 +20,7 @@
{$IFNDEF FFMPEG_DIR}
{$IF (@FFMPEG_VERSION_MINOR@ > 0) or (@FFMPEG_VERSION_MAJOR@ > 0)}
{$DEFINE FFMPEG_DIR := 'ffmpeg-@FFMPEG_VERSION_MAJOR@.@FFMPEG_VERSION_MINOR@'}
+ {$DEFINE FF_API_OLD_DECODE_AUDIO}
{$ELSE}
{$DEFINE FFMPEG_DIR := 'ffmpeg'}
{$DEFINE useOLD_FFMPEG}
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