From 599c5a3f287f4a5eedba05956c1f1666260358b7 Mon Sep 17 00:00:00 2001 From: jbr Date: Sat, 18 Apr 2009 18:51:01 +0000 Subject: [PATCH] Add 3 channel layout convenience macros. git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18609 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- libavcodec/audioconvert.c | 1 + libavcodec/avcodec.h | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c index 94c06f83df..b0a8afacb4 100644 --- a/libavcodec/audioconvert.c +++ b/libavcodec/audioconvert.c @@ -108,6 +108,7 @@ static const struct { { "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 }, diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 05027bacdf..c5632c8d05 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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 @@ enum SampleFormat { /* 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) -- 2.11.4.GIT