From 6b696eb1fcbce5971403ea5435be2756e933e280 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Fri, 17 May 2013 21:09:01 +0000 Subject: a couple of fixes. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2991 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-0.9/avcodec.pas | 2 +- src/lib/ffmpeg-0.9/avformat.pas | 49 +++++++++++------------------------ src/lib/ffmpeg-0.9/libavutil/opt2.pas | 2 +- 3 files changed, 17 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/lib/ffmpeg-0.9/avcodec.pas b/src/lib/ffmpeg-0.9/avcodec.pas index bf0c9e19..6afda84b 100644 --- a/src/lib/ffmpeg-0.9/avcodec.pas +++ b/src/lib/ffmpeg-0.9/avcodec.pas @@ -3988,7 +3988,7 @@ function avcodec_find_best_pix_fmt(pix_fmt_mask: cint64; src_pix_fmt: TAVPixelFo * that occurs when converting from src to selected dst pixel format. * @return The best pixel format to convert to or -1 if none was found. *) -function avcodec_find_best_pix_fmt2(dst_pix_fmt1: TAVPixelFormat; dst_pix_fmt2: : TAVPixelFormat; +function avcodec_find_best_pix_fmt2(dst_pix_fmt1: TAVPixelFormat; dst_pix_fmt2: TAVPixelFormat; src_pix_fmt: TAVPixelFormat; has_alpha: cint; loss_ptr: Pcint): TAVPixelFormat; cdecl; external av__codec; diff --git a/src/lib/ffmpeg-0.9/avformat.pas b/src/lib/ffmpeg-0.9/avformat.pas index 7cbdf9a0..005f9031 100644 --- a/src/lib/ffmpeg-0.9/avformat.pas +++ b/src/lib/ffmpeg-0.9/avformat.pas @@ -223,6 +223,13 @@ function av_metadata_get(m: PAVDictionary; key: {const} PAnsiChar; function av_metadata_set2(var pm: PAVDictionary; key: {const} PAnsiChar; value: {const} PAnsiChar; flags: cint): cint; cdecl; external av__format; deprecated; +(** + * This function is provided for compatibility reason and currently does nothing. + *) +procedure av_metadata_conv(ctx: PAVFormatContext; const d_conv: PAVMetadataConv; + const s_conv: PAVMetadataConv); + cdecl; external av__format; deprecated; + (** * Copy metadata from one AVDictionary struct into another. * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL, @@ -360,12 +367,17 @@ 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 *) // used by TAVFormatContext.debug FF_FDEBUG_TS = 0001; MAX_PROBE_PACKETS = 2500; RAW_PACKET_BUFFER_SIZE = 2500000; + MAX_STD_TIMEBASES = (60*12+5); + type PPAVCodecTag = ^PAVCodecTag; @@ -403,17 +415,6 @@ type s_conv: {const} PAVMetadataConv; end; - PAVChapter = ^TAVChapter; - TAVChapter = record - id: cint; ///< unique ID to identify the chapter - time_base: TAVRational; ///< time base in which the start/end timestamps are specified - start, end_: cint64; ///< chapter start/end time in time_base units - metadata: PAVDictionary; - end; - - TAVChapterArray = array[0..(MaxInt div SizeOf(TAVChapter))-1] of TAVChapter; - PAVChapterArray = ^TAVChapterArray; - TAVFormatParameters = record time_base: TAVRational; sample_rate: cint; @@ -564,7 +565,7 @@ type * @return >= 0 on success (but not necessarily the new offset) *) read_seek: function (c: PAVFormatContext; stream_index: cint; - timestamp: cint64; flags: cint): cint; cdecl; deprecated; + timestamp: cint64; flags: cint): cint; cdecl; {deprecated;} {$IFEND} (** @@ -1228,37 +1229,17 @@ type {$ENDIF} end; - (** - * New fields can be added to the end with minor version bumps. - * Removal, reordering and changes to existing fields require a major - * version bump. - * sizeof(AVProgram) must not be used outside libav*. - *) - TAVProgram = record - id : cint; - flags : cint; - discard : TAVDiscard; ///< selects which program to discard and which to feed to the caller - stream_index : PCardinal; - nb_stream_indexes : PCardinal; - metadata : PAVMetadata; - end; - TAVPacketList = record pkt: TAVPacket; next: PAVPacketList; end; (** - * Convert all the metadata sets from ctx according to the source and - * destination conversion tables. If one of the tables is NULL, then - * tags are converted to/from ffmpeg generic tag names. - * - * @param d_conv destination tags format conversion table - * @param s_conv source tags format conversion table + * This function is provided for compatibility reason and currently does nothing. *) procedure av_metadata_conv(ctx: PAVFormatContext; {const} d_conv: PAVMetadataConv; {const} s_conv: PAVMetadataConv); - cdecl; external av__format; + cdecl; external av__format; deprecated; (** * If f is NULL, returns the first registered input format, diff --git a/src/lib/ffmpeg-0.9/libavutil/opt2.pas b/src/lib/ffmpeg-0.9/libavutil/opt2.pas index dcc240c5..1d88d7af 100644 --- a/src/lib/ffmpeg-0.9/libavutil/opt2.pas +++ b/src/lib/ffmpeg-0.9/libavutil/opt2.pas @@ -60,7 +60,7 @@ function av_opt_set_q (obj: pointer; name: {const} PAnsiChar; val: TAVRation (** * @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; outval: ^Pcuint8): cint; +function av_opt_get (obj: pointer; name: {const} PAnsiChar; search_flags: cint; outval: Pcuint8): cint; cdecl; external av__util; function av_opt_get_int (obj: pointer; name: {const} PAnsiChar; search_flags: cint; outval: Pcint64): cint; cdecl; external av__util; -- cgit v1.2.3