diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2009-04-18 18:51:01 +0000 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2009-04-18 18:51:01 +0000 |
| commit | 1b7bc4a2455f7efc8b29e6f9c2dc22eff3c84e27 (patch) | |
| tree | f70dee6bcc2d5d1cd3aebd452cbb9189d7eab327 | |
| parent | f63f689e101225d2a35f614c8843e7bdcdadee78 (diff) | |
| download | ffmpeg-1b7bc4a2455f7efc8b29e6f9c2dc22eff3c84e27.tar.gz | |
Add 3 channel layout convenience macros.
Originally committed as revision 18609 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/audioconvert.c | 1 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 5 |
2 files changed, 5 insertions, 1 deletions
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) |