aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/lib/ffmpeg-1.2/avcodec.pas72
1 files changed, 23 insertions, 49 deletions
diff --git a/src/lib/ffmpeg-1.2/avcodec.pas b/src/lib/ffmpeg-1.2/avcodec.pas
index cc0aadf3..0f4ac469 100644
--- a/src/lib/ffmpeg-1.2/avcodec.pas
+++ b/src/lib/ffmpeg-1.2/avcodec.pas
@@ -178,7 +178,7 @@ const
*
* Basic definitions, functions for querying libavcodec capabilities,
* allocating core structures, etc.
- * @{
+ * @
*)
(**
@@ -1057,18 +1057,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}
@@ -1392,10 +1395,11 @@ type
);
TAVPacketSideDataType = record
- data: PByte;
- size: cint;
- type_: AVPacketSideDataType;
+ data: PByte;
+ size: cint;
+ type_: AVPacketSideDataType;
end;
+
PAVPacketSideDataType = ^TAVPacketSideDataType;
(**
@@ -1497,6 +1501,10 @@ const
FF_DECODE_ERROR_INVALID_BITSTREAM = 1;
FF_DECODE_ERROR_MISSING_REFERENCE = 2;
+ FF_SUB_CHARENC_MODE_DO_NOTHING = -1; ///< do nothing (demuxer outputs a stream supposed to be already in UTF-8, or the codec is bitmap for instance)
+ FF_SUB_CHARENC_MODE_AUTOMATIC = 0; ///< libavcodec will select the mode itself
+ FF_SUB_CHARENC_MODE_PRE_DECODER = 1; ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the decoder, requires iconv
+
type
PAVCodecContext = ^TAVCodecContext;
@@ -3438,12 +3446,6 @@ type
sub_charenc_mode: cint;
end; {TAVCodecContext}
-const
- FF_SUB_CHARENC_MODE_DO_NOTHING = -1; ///< do nothing (demuxer outputs a stream supposed to be already in UTF-8, or the codec is bitmap for instance)
- FF_SUB_CHARENC_MODE_AUTOMATIC = 0; ///< libavcodec will select the mode itself
- FF_SUB_CHARENC_MODE_PRE_DECODER = 1; ///< the AVPacket data needs to be recoded to UTF-8 before being fed to the decoder, requires iconv
-
-type
(**
* AVProfile.
*)
@@ -3553,7 +3555,7 @@ type
next: PAVCodec;
(**
* @name Frame-level threading support functions
- * @{
+ * @
*)
(**
* If defined, called on thread contexts when they are created.
@@ -3703,7 +3705,7 @@ type
* @defgroup lavc_picture AVPicture
*
* Functions for working with AVPicture
- * @{
+ * @
*)
(**
@@ -4038,12 +4040,8 @@ procedure avsubtitle_free(sub: PAVSubtitle);
cdecl; external av__codec;
(**
- * @}
- *)
-
-(**
* @addtogroup lavc_packet
- * @{
+ * @
*)
(*
@@ -4376,11 +4374,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
@@ -4590,13 +4588,8 @@ procedure av_parser_close(s: PAVCodecParserContext);
cdecl; external av__codec;
(**
- * @}
- * @}
- *)
-
-(**
* @addtogroup lavc_encoding
- * @{
+ * @
*)
(**
@@ -4752,17 +4745,13 @@ function avcodec_encode_subtitle(avctx: PAVCodecContext; buf: PByteArray;
buf_size: cint; sub: {const} PAVSubtitle): cint;
cdecl; external av__codec;
-(**
- * @}
- *)
-
{$IFDEF FF_API_AVCODEC_RESAMPLE}
(**
* @defgroup lavc_resample Audio resampling
* @ingroup libavc
* @deprecated use libswresample instead
*
- * @{
+ * @
*)
type
PReSampleContext = pointer;
@@ -4792,7 +4781,7 @@ type
filter_length: cint; log2_phase_count: cint;
linear: cint; cutoff: cdouble): PReSampleContext;
cdecl; external av__codec; deprecated;
-
+
function audio_resample (s: PReSampleContext; output: PSmallint; input: PSmallint; nb_samples: cint): cint;
cdecl; external av__codec; deprecated;
@@ -4850,9 +4839,6 @@ procedure av_resample_compensate (c: PAVResampleContext; sample_delta: cint;
procedure av_resample_close (c: PAVResampleContext);
cdecl; external av__codec; deprecated;
-(**
- * @}
- *)
{$ENDIF}
(**
@@ -4949,10 +4935,6 @@ function av_picture_pad(dst: PAVPicture; src: {const} PAVPicture;
cdecl; external av__codec;
(**
- * @}
- *)
-
-(**
* @defgroup lavc_misc Utility functions
* @ingroup libavc
*
@@ -5126,10 +5108,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;
@@ -5455,10 +5433,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.