diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-05-16 23:07:55 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2013-05-16 23:07:55 +0000 |
| commit | 0c729e2fc2d4f1236b04b220ae88c90dc890fb24 (patch) | |
| tree | f1d87d07380553a9cb7a2c8a8e563f06a52c1bda /src/lib | |
| parent | 93346297e1917b5115430d4039d7c9628eaccf15 (diff) | |
| download | usdx-0c729e2fc2d4f1236b04b220ae88c90dc890fb24.tar.gz usdx-0c729e2fc2d4f1236b04b220ae88c90dc890fb24.tar.xz usdx-0c729e2fc2d4f1236b04b220ae88c90dc890fb24.zip | |
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
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/ffmpeg-0.9/avcodec.pas | 4 | ||||
| -rw-r--r-- | src/lib/ffmpeg-0.9/avutil.pas | 4 |
2 files changed, 4 insertions, 4 deletions
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} |