Mercurial > libavcodec.hg
changeset 9502:56f844aec27b libavcodec
Add 3 channel layout convenience macros.
| author | jbr |
|---|---|
| date | Sat, 18 Apr 2009 18:51:01 +0000 |
| parents | 880d9562d218 |
| children | 1997b5b2a40e |
| files | audioconvert.c avcodec.h |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/audioconvert.c Sat Apr 18 17:26:00 2009 +0000 +++ b/audioconvert.c Sat Apr 18 18:51:01 2009 +0000 @@ -108,6 +108,7 @@ { "mono", 1, CH_LAYOUT_MONO }, { "stereo", 2, CH_LAYOUT_STEREO }, { "surround", 3, CH_LAYOUT_SURROUND }, + { "4.0", 4, CH_LAYOUT_4POINT0 }, { "quad", 4, CH_LAYOUT_QUAD }, { "5.0", 5, CH_LAYOUT_5POINT0 }, { "5.0", 5, CH_LAYOUT_5POINT0_BACK },
--- a/avcodec.h Sat Apr 18 17:26:00 2009 +0000 +++ b/avcodec.h Sat Apr 18 18:51:01 2009 +0000 @@ -30,7 +30,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 26 +#define LIBAVCODEC_VERSION_MINOR 27 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -380,7 +380,10 @@ /* Audio channel convenience macros */ #define CH_LAYOUT_MONO (CH_FRONT_CENTER) #define CH_LAYOUT_STEREO (CH_FRONT_LEFT|CH_FRONT_RIGHT) +#define CH_LAYOUT_2_1 (CH_LAYOUT_STEREO|CH_BACK_CENTER) #define CH_LAYOUT_SURROUND (CH_LAYOUT_STEREO|CH_FRONT_CENTER) +#define CH_LAYOUT_4POINT0 (CH_LAYOUT_SURROUND|CH_BACK_CENTER) +#define CH_LAYOUT_2_2 (CH_LAYOUT_STEREO|CH_SIDE_LEFT|CH_SIDE_RIGHT) #define CH_LAYOUT_QUAD (CH_LAYOUT_STEREO|CH_BACK_LEFT|CH_BACK_RIGHT) #define CH_LAYOUT_5POINT0 (CH_LAYOUT_SURROUND|CH_SIDE_LEFT|CH_SIDE_RIGHT) #define CH_LAYOUT_5POINT1 (CH_LAYOUT_5POINT0|CH_LOW_FREQUENCY)