diff options
| author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-02-05 13:43:38 +0000 |
|---|---|---|
| committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-02-05 13:43:38 +0000 |
| commit | 89ac41a2ccb85d6dfccb501ff4877231cab72094 (patch) | |
| tree | fc8de71787a2739768fdc60b736d0186bbc3b12d /Game/Code/Classes | |
| parent | eafa73ec3181ed45a8a6fdea8ef64fc9a1e867b3 (diff) | |
| download | usdx-89ac41a2ccb85d6dfccb501ff4877231cab72094.tar.gz usdx-89ac41a2ccb85d6dfccb501ff4877231cab72094.tar.xz usdx-89ac41a2ccb85d6dfccb501ff4877231cab72094.zip | |
Update of the ffmpeg headers to their current trunk versions.
IMPORTANT: parameter of av_free_packet is a pointer now
procedure av_free_packet (pkt: PAVPacket);
as it is with av_free() and av_freep()
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@814 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Classes')
| -rw-r--r-- | Game/Code/Classes/UAudioDecoder_FFMpeg.pas | 11 | ||||
| -rw-r--r-- | Game/Code/Classes/UVideo.pas | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Game/Code/Classes/UAudioDecoder_FFMpeg.pas b/Game/Code/Classes/UAudioDecoder_FFMpeg.pas index 4cd6ec37..c705d603 100644 --- a/Game/Code/Classes/UAudioDecoder_FFMpeg.pas +++ b/Game/Code/Classes/UAudioDecoder_FFMpeg.pas @@ -45,7 +45,8 @@ uses {$ENDIF} UIni, UMain, - UThemes; + UThemes, + UConfig; type @@ -334,7 +335,7 @@ begin if(av_read_frame(stream.pFormatCtx, packet) < 0) then begin // check for end-of-file (eof is not an error) - {$IF (LIBAVFORMAT_MAJOR_VERSION >= 52)} + {$IF (LIBAVFORMAT_VERSION_MAJOR >= 52)} pbIOCtx := stream.pFormatCtx^.pb; {$ELSE} pbIOCtx := @stream.pFormatCtx^.pb; @@ -370,7 +371,7 @@ begin end else begin - av_free_packet(packet); + av_free_packet(@packet); end; end; @@ -428,7 +429,7 @@ begin if (pkt.data <> nil) then begin - av_free_packet(pkt); + av_free_packet(@pkt); end; if (packetQueue.quit) then @@ -739,7 +740,7 @@ begin while(pkt <> nil) do
begin
pkt1 := pkt^.next;
- av_free_packet(pkt^.pkt);
+ av_free_packet(@pkt^.pkt);
av_freep(pkt);
pkt := pkt1;
end;
diff --git a/Game/Code/Classes/UVideo.pas b/Game/Code/Classes/UVideo.pas index c30b271e..db7e3ffd 100644 --- a/Game/Code/Classes/UVideo.pas +++ b/Game/Code/Classes/UVideo.pas @@ -286,7 +286,7 @@ begin try // if AVPacket.data <> nil then - av_free_packet( AVPacket ); // JB-ffmpeg + av_free_packet( @AVPacket ); // JB-ffmpeg except // TODO : JB_FFMpeg ... why does this now AV sometimes ( or always !! ) end; @@ -308,7 +308,7 @@ begin // release internal packet structure created by av_read_frame try // if AVPacket.data <> nil then - av_free_packet( AVPacket ); // JB-ffmpeg + av_free_packet( @AVPacket ); // JB-ffmpeg except // TODO : JB_FFMpeg ... why does this now AV sometimes ( or always !! ) end; |