diff options
Diffstat (limited to '')
-rw-r--r-- | src/lib/ffmpeg-0.9/avcodec.pas | 6 | ||||
-rw-r--r-- | src/lib/ffmpeg-0.9/avformat.pas | 43 | ||||
-rw-r--r-- | src/lib/ffmpeg-0.9/avutil.pas | 10 |
3 files changed, 27 insertions, 32 deletions
diff --git a/src/lib/ffmpeg-0.9/avcodec.pas b/src/lib/ffmpeg-0.9/avcodec.pas index 35ea05f8..6a42c474 100644 --- a/src/lib/ffmpeg-0.9/avcodec.pas +++ b/src/lib/ffmpeg-0.9/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.9/avformat.pas b/src/lib/ffmpeg-0.9/avformat.pas index 7d8b4f15..f5951934 100644 --- a/src/lib/ffmpeg-0.9/avformat.pas +++ b/src/lib/ffmpeg-0.9/avformat.pas @@ -244,46 +244,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.9/avutil.pas b/src/lib/ffmpeg-0.9/avutil.pas index 9a2ef4ed..acb06237 100644 --- a/src/lib/ffmpeg-0.9/avutil.pas +++ b/src/lib/ffmpeg-0.9/avutil.pas @@ -78,6 +78,13 @@ const {$MESSAGE Error 'Linked version of libavutil is not yet supported!'} {$IFEND} +type +{$IFNDEF FPC} + // defines for Delphi + size_t = cardinal; +{$ENDIF} + Psize_t = ^size_t; + (** * Return the LIBAVUTIL_VERSION_INT constant. *) @@ -235,9 +242,6 @@ begin Result := (ord(d) or (ord(c) shl 8) or (ord(b) shl 16) or (ord(a) shl 24)); end; -type - Psize_t = ^size_t; - function av_size_mult(a: size_t; b: size_t; r: Psize_t): size_t; cdecl; external av__util; (* To Be Implemented, March 2012 KMS *) |