From 0c729e2fc2d4f1236b04b220ae88c90dc890fb24 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Thu, 16 May 2013 23:07:55 +0000 Subject: fix typo and reorder log.pas & opt.pas and translate avcodec_find_best_pix_fmt2 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2987 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-0.9/avcodec.pas | 4 ++-- src/lib/ffmpeg-0.9/avutil.pas | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/lib/ffmpeg-0.9/avcodec.pas b/src/lib/ffmpeg-0.9/avcodec.pas index b00c7260..bf0c9e19 100644 --- a/src/lib/ffmpeg-0.9/avcodec.pas +++ b/src/lib/ffmpeg-0.9/avcodec.pas @@ -3988,8 +3988,8 @@ 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. *) -enum PixelFormat avcodec_find_best_pix_fmt2(enum PixelFormat dst_pix_fmt1, enum PixelFormat dst_pix_fmt2, - enum PixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); +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; {$IFDEF FF_API_GET_ALPHA_INFO} diff --git a/src/lib/ffmpeg-0.9/avutil.pas b/src/lib/ffmpeg-0.9/avutil.pas index acb06237..fc3cdd24 100644 --- a/src/lib/ffmpeg-0.9/avutil.pas +++ b/src/lib/ffmpeg-0.9/avutil.pas @@ -202,10 +202,10 @@ function av_x_if_null(p: {const} pointer; x: {const} pointer): pointer; {$IFDEF {$INCLUDE libavutil/mem.pas} -{$INCLUDE libavutil/opt.pas} - {$INCLUDE libavutil/log.pas} +{$INCLUDE libavutil/opt.pas} + {$INCLUDE libavutil/pixfmt.pas} {$INCLUDE libavutil/samplefmt.pas} -- cgit v1.2.3