From eaca529cd5bcea6af4b8cdf9a878bec49cba231c Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sat, 20 Oct 2012 00:32:35 +0000 Subject: first try of version 0.11.* git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2926 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-0.11/libavcodec/audioconvert.pas | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/lib/ffmpeg-0.11/libavcodec') diff --git a/src/lib/ffmpeg-0.11/libavcodec/audioconvert.pas b/src/lib/ffmpeg-0.11/libavcodec/audioconvert.pas index 9b2877d1..41c8ca29 100644 --- a/src/lib/ffmpeg-0.11/libavcodec/audioconvert.pas +++ b/src/lib/ffmpeg-0.11/libavcodec/audioconvert.pas @@ -19,7 +19,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavutil/audioconvert.h - * avutil version 50.43.0 + * avutil version 51.54.100 * *) @@ -99,19 +99,21 @@ const AV_CH_LAYOUT_STEREO_DOWNMIX = (AV_CH_STEREO_LEFT or AV_CH_STEREO_RIGHT); (** - * Return a channel layout id that matches name, 0 if no match. + * Return a channel layout id that matches name, or 0 if no match is found. + * * name can be one or several of the following notations, * separated by '+' or '|': * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0, * 5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix); * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC, * SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR); - * - a number of channels, in decimal, optionnally followed by 'c', yielding + * - a number of channels, in decimal, optionally followed by 'c', yielding * the default channel layout for that number of channels (@see * av_get_default_channel_layout); * - a channel layout mask, in hexadecimal starting with "0x" (see the * AV_CH_* macros). - + Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7" + * + * Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7" *) function av_get_channel_layout(name: {const} PAnsiChar): cuint64; cdecl; external av__util; -- cgit v1.2.3