diff options
| author | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-06-21 23:33:15 +0000 |
|---|---|---|
| committer | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-06-21 23:33:15 +0000 |
| commit | 4a89698f9faaf96ea496ad11d83aa8c96c799f08 (patch) | |
| tree | b610f635a7a414941f562dcef70626826b9eb68c /src/lib/ffmpeg-2.2/libavcodec | |
| parent | 5b78c67260c14642ca29844750752ac2aa9d8333 (diff) | |
| download | usdx-4a89698f9faaf96ea496ad11d83aa8c96c799f08.tar.gz usdx-4a89698f9faaf96ea496ad11d83aa8c96c799f08.tar.xz usdx-4a89698f9faaf96ea496ad11d83aa8c96c799f08.zip | |
Update avcodec files for ffmpeg 2.2
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3074 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/lib/ffmpeg-2.2/libavcodec')
| -rw-r--r-- | src/lib/ffmpeg-2.2/libavcodec/audioconvert.pas | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/ffmpeg-2.2/libavcodec/audioconvert.pas b/src/lib/ffmpeg-2.2/libavcodec/audioconvert.pas index 7ac9e4bd..9cc78f97 100644 --- a/src/lib/ffmpeg-2.2/libavcodec/audioconvert.pas +++ b/src/lib/ffmpeg-2.2/libavcodec/audioconvert.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/channel_layout.h and libavcodec/audioconvert.h - * avutil version 52.38.100; avcodec version 55.18.102 + * avutil version 52.66.100; avcodec version 55.52.102 * *) @@ -238,6 +238,8 @@ function av_get_standard_channel_layout(index: cuint; layout: Pcuint64; name: {const} PPAnsiChar): cint; cdecl; external av__util; +{$IFDEF FF_API_AUDIO_CONVERT} + (** libavcodec/audioconvert.h **) // type definition from libavcodec/audioconvert.c @@ -285,3 +287,5 @@ function av_audio_convert(ctx: PAVAudioConvert; out[6]: {const} P6; out_stride[6]: {const} I6; in[6]: {const} P6; in_stride[6]: {const} I6; len: cint): cint; cdecl; external av__codec; + +{$IFEND}
\ No newline at end of file |