diff options
author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-07-14 12:17:43 +0000 |
---|---|---|
committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-07-14 12:17:43 +0000 |
commit | 7c1b9be0d3462a15c9b37a1388e8d9910a8f6f96 (patch) | |
tree | 5f99a5e170a6724256386caf6d6a591149278255 /src/lib/ffmpeg-0.7 | |
parent | 224fbfe4b038940bb16106bf1b606f0513833a21 (diff) | |
download | usdx-7c1b9be0d3462a15c9b37a1388e8d9910a8f6f96.tar.gz usdx-7c1b9be0d3462a15c9b37a1388e8d9910a8f6f96.tar.xz usdx-7c1b9be0d3462a15c9b37a1388e8d9910a8f6f96.zip |
fix size_t for Delphi. fix duplicate packet procedures in avformat and avcodec.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2919 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r-- | src/lib/ffmpeg-0.7/avcodec.pas | 6 | ||||
-rw-r--r-- | src/lib/ffmpeg-0.7/avformat.pas | 43 | ||||
-rw-r--r-- | src/lib/ffmpeg-0.7/avutil.pas | 6 |
3 files changed, 26 insertions, 29 deletions
diff --git a/src/lib/ffmpeg-0.7/avcodec.pas b/src/lib/ffmpeg-0.7/avcodec.pas index 159c9b58..a402f0c3 100644 --- a/src/lib/ffmpeg-0.7/avcodec.pas +++ b/src/lib/ffmpeg-0.7/avcodec.pas @@ -173,6 +173,12 @@ const FF_API_GET_PIX_FMT_NAME = LIBAVCODEC_VERSION_MAJOR < 54; {$endif} +{$IFNDEF FPC} +type + // defines for Delphi + size_t = cardinal; +{$ENDIF} + {$IF FF_API_OLD_AUDIOCONVERT} {$I libavcodec/audioconvert.pas} {$IFEND} diff --git a/src/lib/ffmpeg-0.7/avformat.pas b/src/lib/ffmpeg-0.7/avformat.pas index 848f1672..7153bfb0 100644 --- a/src/lib/ffmpeg-0.7/avformat.pas +++ b/src/lib/ffmpeg-0.7/avformat.pas @@ -259,46 +259,31 @@ procedure av_metadata_free(var m: PAVDictionary); (* packet functions *) -const - PKT_FLAG_KEY = $0001; - -procedure av_destruct_packet_nofree(var pkt: TAVPacket); - cdecl; external av__format; - -(** - * Default packet destructor. - *) -procedure av_destruct_packet(var pkt: TAVPacket); - cdecl; external av__format; - -(** - * Initialize optional fields of a packet with default values. - * - * @param pkt packet - *) -procedure av_init_packet(var pkt: TAVPacket); - cdecl; external av__format; - (** - * Allocate the payload of a packet and initialize its fields with + * Allocate and read the payload of a packet and initialize its fields with * default values. * * @param pkt packet - * @param size wanted payload size - * @return 0 if OK, AVERROR_xxx otherwise + * @param size desired payload size + * @return >0 (read size) if OK, AVERROR_xxx otherwise *) -function av_new_packet(var pkt: TAVPacket; size: cint): cint; +function av_get_packet(s: PByteIOContext; var pkt: TAVPacket; size: cint): cint; cdecl; external av__format; (** - * Allocate and read the payload of a packet and initialize its fields with - * default values. + * Read data and append it to the current content of the AVPacket. + * If pkt->size is 0 this is identical to av_get_packet. + * Note that this uses av_grow_packet and thus involves a realloc + * which is inefficient. Thus this function should only be used + * when there is no reasonable way to know (an upper bound of) + * the final size. * * @param pkt packet - * @param size desired payload size - * @return >0 (read size) if OK, AVERROR_xxx otherwise + * @param size amount of data to read + * @return >0 (read size) if OK, AVERROR_xxx otherwise, previous data + * will not be lost even if an error occurs. *) -function av_get_packet(s: PByteIOContext; var pkt: TAVPacket; size: cint): cint; +function av_append_packet(s: PAVIOContext; var pkt: TAVPacket; size: cint): cint; cdecl; external av__format; (*************************************************) diff --git a/src/lib/ffmpeg-0.7/avutil.pas b/src/lib/ffmpeg-0.7/avutil.pas index 7d8ce826..8746d545 100644 --- a/src/lib/ffmpeg-0.7/avutil.pas +++ b/src/lib/ffmpeg-0.7/avutil.pas @@ -78,6 +78,12 @@ const {$MESSAGE Error 'Linked version of libavutil is not yet supported!'} {$IFEND} +{$IFNDEF FPC} +type + // defines for Delphi + size_t = cardinal; +{$ENDIF} + {$INCLUDE libavutil/cpu.pas} {$INCLUDE libavutil/dict.pas} |