diff options
| -rw-r--r-- | src/lib/ffmpeg-1.0/avcodec.pas | 63 | ||||
| -rw-r--r-- | src/lib/ffmpeg-1.0/avformat.pas | 4 | ||||
| -rw-r--r-- | src/lib/ffmpeg-1.0/libavutil/opt.pas | 24 |
3 files changed, 36 insertions, 55 deletions
diff --git a/src/lib/ffmpeg-1.0/avcodec.pas b/src/lib/ffmpeg-1.0/avcodec.pas index 57cf6164..e7e60d2e 100644 --- a/src/lib/ffmpeg-1.0/avcodec.pas +++ b/src/lib/ffmpeg-1.0/avcodec.pas @@ -177,7 +177,7 @@ const * * Basic definitions, functions for querying libavcodec capabilities, * allocating core structures, etc. - * @{ + * @ *) (** @@ -1002,18 +1002,21 @@ type TAVPanScan = record {24} (*** id. * - encoding: set by user. - * - decoding: set by libavcodec. *) + * - decoding: set by libavcodec. + *) id: cint; (*** width and height in 1/16 pel * - encoding: set by user. - * - decoding: set by libavcodec. *) + * - decoding: set by libavcodec. + *) width: cint; height: cint; (*** position of the top left corner in 1/16 pel for up to 3 fields/frames. * - encoding: set by user. - * - decoding: set by libavcodec. *) + * - decoding: set by libavcodec. + *) position: array [0..2] of array [0..1] of cint16; end; {TAVPanScan} @@ -1309,9 +1312,9 @@ type ); TAVPacketSideDataType = record - data: PByte; - size: cint; - type_: AVPacketSideDataType; + data: PByte; + size: cint; + type_: AVPacketSideDataType; end; PAVPacketSideDataType = ^TAVPacketSideDataType; @@ -1463,7 +1466,7 @@ type (** * format of the frame, -1 if unknown or unset - * Values correspond to enum TAVPixelFormat for video frames, + * Values correspond to enum AVPixelFormat for video frames, * enum AVSampleFormat for audio) * - encoding: unused * - decoding: Read by user. @@ -3391,7 +3394,7 @@ type next: PAVCodec; (** * @name Frame-level threading support functions - * @{ + * @ *) (** * If defined, called on thread contexts when they are created. @@ -3541,7 +3544,7 @@ type * @defgroup lavc_picture AVPicture * * Functions for working with AVPicture - * @{ + * @ *) (** @@ -3869,12 +3872,8 @@ procedure avsubtitle_free(sub: PAVSubtitle); cdecl; external av__codec; (** - * @} - *) - -(** * @addtogroup lavc_packet - * @{ + * @ *) (* @@ -3920,7 +3919,7 @@ procedure av_shrink_packet(pkt: PAVPacket; size: cint); * @param pkt packet * @param grow_by number of bytes by which to increase the size of the packet *) -function av_grow_packet(pkt: PAVPacket; grow_by: cint): cint; +function av_grow_packet(pkt: PAVPacket; grow_by: cint): cint; cdecl; external av__codec; (* @@ -4207,11 +4206,11 @@ function avcodec_decode_subtitle2(avctx: PAVCodecContext; sub: PAVSubtitle; (** * @defgroup lavc_parsing Frame parsing - * @{ + * @ *) const - AV_PARSER_PTS_NB = 4; + AV_PARSER_PTS_NB = 4; PARSER_FLAG_COMPLETE_FRAMES = $0001; PARSER_FLAG_ONCE = $0002; /// Set if the parser has a valid file offset @@ -4417,13 +4416,8 @@ procedure av_parser_close(s: PAVCodecParserContext); cdecl; external av__codec; (** - * @} - * @} - *) - -(** * @addtogroup lavc_encoding - * @{ + * @ *) (** @@ -4580,10 +4574,6 @@ function avcodec_encode_subtitle(avctx: PAVCodecContext; buf: PByteArray; cdecl; external av__codec; (** - * @} - *) - -(** * @defgroup lavc_resample Audio resampling * @ingroup libavc * @@ -4617,7 +4607,7 @@ type filter_length: cint; log2_phase_count: cint; linear: cint; cutoff: cdouble): PReSampleContext; cdecl; external av__codec; - + function audio_resample (s: PReSampleContext; output: PSmallint; input: PSmallint; nb_samples: cint): cint; cdecl; external av__codec; @@ -4675,9 +4665,6 @@ procedure av_resample_compensate (c: PAVResampleContext; sample_delta: cint; procedure av_resample_close (c: PAVResampleContext); cdecl; external av__codec; -(** - * @} - *) (** * @addtogroup lavc_picture @@ -4769,10 +4756,6 @@ function av_picture_pad(dst: PAVPicture; src: {const} PAVPicture; cdecl; external av__codec; (** - * @} - *) - -(** * @defgroup lavc_misc Utility functions * @ingroup libavc * @@ -4931,10 +4914,6 @@ function avcodec_find_best_pix_fmt2(dst_pix_fmt1: TAVPixelFormat; dst_pix_fmt2: function avcodec_default_get_format(s: PAVCodecContext; fmt: {const} PAVPixelFormat): TAVPixelFormat; cdecl; external av__codec; -(** - * @} - *) - procedure avcodec_set_dimensions(s: PAVCodecContext; width: cint; height: cint); cdecl; external av__codec; @@ -5253,10 +5232,6 @@ function avcodec_descriptor_next(prev: {const} PAVCodecDescriptor): PAVCodecDesc function avcodec_descriptor_get_by_name(name: {const} PAnsiChar): PAVCodecDescriptor; cdecl; external av__codec; -(** - * @} - *) - implementation end. diff --git a/src/lib/ffmpeg-1.0/avformat.pas b/src/lib/ffmpeg-1.0/avformat.pas index 1cddea38..f36ac31f 100644 --- a/src/lib/ffmpeg-1.0/avformat.pas +++ b/src/lib/ffmpeg-1.0/avformat.pas @@ -1352,7 +1352,7 @@ function av_fmt_ctx_get_duration_estimation_method(ctx: {const} PAVFormatContext * * Functions for querying libavformat capabilities, allocating core structures, * etc. - * @{ + * @ *) (** @@ -1510,7 +1510,7 @@ function avformat_alloc_output_context2(ctx: PPAVFormatContext; oformat: PAVOutp (** * @addtogroup lavf_decoding - * @{ + * @ *) (** diff --git a/src/lib/ffmpeg-1.0/libavutil/opt.pas b/src/lib/ffmpeg-1.0/libavutil/opt.pas index a7a6f83d..806b0250 100644 --- a/src/lib/ffmpeg-1.0/libavutil/opt.pas +++ b/src/lib/ffmpeg-1.0/libavutil/opt.pas @@ -316,15 +316,21 @@ function av_opt_child_class_next(parent: {const} PAVClass; prev: {const} PAVClas * AVERROR(ERANGE) if the value is out of range * AVERROR(EINVAL) if the value is not valid *) -function av_opt_set (obj: pointer; name: {const} PAnsiChar; val: {const} PAnsiChar; search_flags: cint): cint; +function av_opt_set (obj: pointer; name: {const} PAnsiChar; val: {const} PAnsiChar; search_flags: cint): cint; cdecl; external av__util; -function av_opt_set_int (obj: pointer; name: {const} PAnsiChar; val: cint64; search_flags: cint): cint; +function av_opt_set_int (obj: pointer; name: {const} PAnsiChar; val: cint64; search_flags: cint): cint; cdecl; external av__util; -function av_opt_set_double(obj: pointer; name: {const} PAnsiChar; val: cdouble; search_flags: cint): cint; +function av_opt_set_double (obj: pointer; name: {const} PAnsiChar; val: cdouble; search_flags: cint): cint; cdecl; external av__util; -function av_opt_set_q (obj: pointer; name: {const} PAnsiChar; val: TAVRational; search_flags: cint): cint; +function av_opt_set_q (obj: pointer; name: {const} PAnsiChar; val: TAVRational; search_flags: cint): cint; cdecl; external av__util; -function av_opt_set_bin (obj: pointer; name: {const} PAnsiChar; val: {const} cuint8; search_flags: cint): cint; +function av_opt_set_bin (obj: pointer; name: {const} PAnsiChar; val: {const} cuint8; search_flags: cint): cint; + cdecl; external av__util; +function av_opt_set_image_size(obj: pointer; name: {const} PAnsiChar; w, h, search_flags: cint): cint; + cdecl; external av__util; +function av_opt_set_pixel_fmt (obj: pointer; name: {const} PAnsiChar; fmt: TAVPixelFormat; search_flags: cint): cint; + cdecl; external av__util; +function av_opt_set_sample_fmt(obj: pointer; name: {const} PAnsiChar; fmt: TAVPixelFormat; search_flags: cint): cint; cdecl; external av__util; (** * @} @@ -345,13 +351,13 @@ function av_opt_set_bin (obj: pointer; name: {const} PAnsiChar; val: {const} c (** * @note the returned string will av_malloc()ed and must be av_free()ed by the caller *) -function av_opt_get (obj: pointer; name: {const} PAnsiChar; search_flags: cint; out out_val: Pcuint8): cint; +function av_opt_get (obj: pointer; name: {const} PAnsiChar; search_flags: cint; out out_val: Pcuint8): cint; cdecl; external av__util; -function av_opt_get_int (obj: pointer; name: {const} PAnsiChar; search_flags: cint; out_val: Pcint64): cint; +function av_opt_get_int (obj: pointer; name: {const} PAnsiChar; search_flags: cint; out_val: Pcint64): cint; cdecl; external av__util; -function av_opt_get_double(obj: pointer; name: {const} PAnsiChar; search_flags: cint; out_val: Pcdouble): cint; +function av_opt_get_double (obj: pointer; name: {const} PAnsiChar; search_flags: cint; out_val: Pcdouble): cint; cdecl; external av__util; -function av_opt_get_q (obj: pointer; name: {const} PAnsiChar; search_flags: cint; out_val: PAVRational): cint; +function av_opt_get_q (obj: pointer; name: {const} PAnsiChar; search_flags: cint; out_val: PAVRational): cint; cdecl; external av__util; (** * @} |