From c2395dcb9f75e7a75429650ba138d20cb160d531 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Thu, 24 May 2012 08:37:02 +0000 Subject: version 0.10 unified. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2886 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-0.10/avcodec.pas | 2 +- src/lib/ffmpeg-0.10/libavutil/dict.pas | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib/ffmpeg-0.10') diff --git a/src/lib/ffmpeg-0.10/avcodec.pas b/src/lib/ffmpeg-0.10/avcodec.pas index 6e4a9a32..cf4e9e8b 100644 --- a/src/lib/ffmpeg-0.10/avcodec.pas +++ b/src/lib/ffmpeg-0.10/avcodec.pas @@ -4389,7 +4389,7 @@ function avcodec_open(avctx: PAVCodecContext; codec: PAVCodec): cint; * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(), * av_dict_set(), av_opt_find(). *) -function avcodec_open2(avctx: PAVCodecContext; codec: PAVCodec; options: pointer): cint; +function avcodec_open2(avctx: PAVCodecContext; codec: PAVCodec; options: PPAVDictionary): cint; cdecl; external av__codec; {$IFDEF FF_API_OLD_DECODE_AUDIO} diff --git a/src/lib/ffmpeg-0.10/libavutil/dict.pas b/src/lib/ffmpeg-0.10/libavutil/dict.pas index 472168f1..ff4fa02b 100644 --- a/src/lib/ffmpeg-0.10/libavutil/dict.pas +++ b/src/lib/ffmpeg-0.10/libavutil/dict.pas @@ -42,6 +42,7 @@ type (* with the "help" of libavutil/internal.h: *) + PPAVDictionary = ^PAVDictionary; PAVDictionary = ^TAVDictionary; TAVDictionary = record count: cint; -- cgit v1.2.3