diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-12-25 23:09:50 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-12-25 23:09:50 +0000 |
| commit | fa87d09bc2d419bdf22a04a8353a839ac598bbff (patch) | |
| tree | e4ca0fd24df262af554d18cb27cceca38d7bcb57 /src | |
| parent | b7beff96f13d7008e8913131658d61529f3456ba (diff) | |
| download | usdx-fa87d09bc2d419bdf22a04a8353a839ac598bbff.tar.gz usdx-fa87d09bc2d419bdf22a04a8353a839ac598bbff.tar.xz usdx-fa87d09bc2d419bdf22a04a8353a839ac598bbff.zip | |
try to fix it with ffmpeg-2.*
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3058 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
| -rw-r--r-- | src/media/UMediaCore_FFmpeg.pas | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/media/UMediaCore_FFmpeg.pas b/src/media/UMediaCore_FFmpeg.pas index 16bac05d..55d9a779 100644 --- a/src/media/UMediaCore_FFmpeg.pas +++ b/src/media/UMediaCore_FFmpeg.pas @@ -634,7 +634,9 @@ begin av_init_packet(TempPacket^); TempPacket^.data := Pointer(STATUS_PACKET); TempPacket^.flags := StatusFlag; +{$IF FFMPEG_VERSION_INT < 2000000} TempPacket^.priv := StatusInfo; +{$ENDIF} // put a copy of the package into the queue Result := Put(TempPacket); // data has been copied -> delete temp. package @@ -643,13 +645,17 @@ end; procedure TPacketQueue.FreeStatusInfo(var Packet: TAVPacket); begin +{$IF FFMPEG_VERSION_INT < 2000000} if (Packet.priv <> nil) then FreeMem(Packet.priv); +{$ENDIF} end; function TPacketQueue.GetStatusInfo(var Packet: TAVPacket): Pointer; begin +{$IF FFMPEG_VERSION_INT < 2000000} Result := Packet.priv; +{$ENDIF} end; function TPacketQueue.Get(var Packet: TAVPacket; Blocking: boolean): integer; |