From 2d2e572302584588bc6a05fb33efec13e37d7a7a Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 3 Mar 2013 01:23:38 +0000 Subject: first fix of ffmpeg-1.0 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2973 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-1.0/avformat.pas | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'src/lib/ffmpeg-1.0/avformat.pas') diff --git a/src/lib/ffmpeg-1.0/avformat.pas b/src/lib/ffmpeg-1.0/avformat.pas index 105cc2b6..1cddea38 100644 --- a/src/lib/ffmpeg-1.0/avformat.pas +++ b/src/lib/ffmpeg-1.0/avformat.pas @@ -458,7 +458,7 @@ const increasing timestamps, but they must still be monotonic *) - AVFMT_SEEK_TO_PTS = $4000000 (**< Seeking is based on PTS *) + AVFMT_SEEK_TO_PTS = $4000000; (**< Seeking is based on PTS *) // used by AVIndexEntry AVINDEX_KEYFRAME = $0001; @@ -504,9 +504,9 @@ const * even when user did not explicitly ask for subtitles. *) AV_DISPOSITION_FORCED = $0040; - AV_DISPOSITION_HEARING_IMPAIRED = $0080; /**< stream for hearing impaired audiences */ - AV_DISPOSITION_VISUAL_IMPAIRED = $0100; /**< stream for visual impaired audiences */ - AV_DISPOSITION_CLEAN_EFFECTS = $0200; /**< stream without voice */ + AV_DISPOSITION_HEARING_IMPAIRED = $0080; (**< stream for hearing impaired audiences *) + AV_DISPOSITION_VISUAL_IMPAIRED = $0100; (**< stream for visual impaired audiences *) + AV_DISPOSITION_CLEAN_EFFECTS = $0200; (**< stream without voice *) (** * The stream is stored in the file as an attached picture/"cover art" (e.g. * APIC frame in ID3v2). The single packet associated with it will be returned @@ -533,7 +533,12 @@ type PPAVStream = ^PAVStream; PAVStream = ^TAVStream; + PAVPacketList = ^TAVPacketList; + TAVPacketList = record + pkt: TAVPacket; + next: PAVPacketList; + end; (*AVPacketList*) PPAVProgram = ^PAVProgram; PAVProgram = ^TAVProgram; @@ -761,17 +766,14 @@ type max_ts: cint64; flags: cint): cint; cdecl; end; -(** - * @} - *) TAVStreamParseType = ( AVSTREAM_PARSE_NONE, AVSTREAM_PARSE_FULL, (**< full parsing and repack *) AVSTREAM_PARSE_HEADERS, (**< Only parse headers, do not repack. *) AVSTREAM_PARSE_TIMESTAMPS, (**< full parsing and interpolation of timestamps for frames not starting on a packet boundary *) - AVSTREAM_PARSE_FULL_ONCE (**< full parsing and repack of the first frame only, only implemented for H.264 currently *) - AVSTREAM_PARSE_FULL_RAW = $57415230; // MKTAG(0,'R','A','W'), + AVSTREAM_PARSE_FULL_ONCE, (**< full parsing and repack of the first frame only, only implemented for H.264 currently *) + AVSTREAM_PARSE_FULL_RAW = $57415230 // MKTAG(0,'R','A','W'), (**< full parsing and repack with timestamp and position generation by parser for raw this assumes that each packet in the file contains no demuxer level headers and just codec level data, otherwise position generaion would fail *) @@ -1092,7 +1094,7 @@ type * iformat/oformat.flags. In such a case, the (de)muxer will handle * I/O in some other way and this field will be NULL. *) - pb: PByteIOContext; + pb: PByteIOContext; (* stream info *) ctx_flags: cint; (**< Format-specific flags, see AVFMTCTX_xx *) @@ -1344,11 +1346,6 @@ type function av_fmt_ctx_get_duration_estimation_method(ctx: {const} PAVFormatContext): TAVDurationEstimationMethod; cdecl; external av__format; - TAVPacketList = record - pkt: TAVPacket; - next: PAVPacketList; - end; (*AVPacketList*) - (** * @defgroup lavf_core Core functions * @ingroup libavf @@ -1572,7 +1569,8 @@ function av_probe_input_format3(pd: PAVProbeData; is_opened: cint; score_ret: Pc *) function av_probe_input_buffer(pb: PAVIOContext; var fmt: PAVInputFormat; filename: {const} PAnsiChar; logctx: pointer; - offset: cuint; max_probe_size: cuint); + offset: cuint; max_probe_size: cuint): cint; + cdecl; external av__format; (** * Open an input stream and read the header. The codecs are not opened. -- cgit v1.2.3