@@ -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 },

@@ -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)