summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-12-06 15:38:55 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2011-12-09 16:12:58 -0500
commit1d2449a613f7dc6da27a237abdca7dde235cef65 (patch)
treeb7b65e53df334c3f1bfcc84928a6b62494c06379 /libavutil
parent8e8c51318c1fe4ae61de578f0823b88aa3fe8222 (diff)
audioconvert: change 7.1 "wide" layout to use side surround channels
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/audioconvert.h2
-rw-r--r--libavutil/avutil.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h
index 54b13b2bea..3df97792e8 100644
--- a/libavutil/audioconvert.h
+++ b/libavutil/audioconvert.h
@@ -82,7 +82,7 @@
#define AV_CH_LAYOUT_5POINT1_BACK (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
#define AV_CH_LAYOUT_7POINT0 (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
#define AV_CH_LAYOUT_7POINT1 (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
#define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
/**
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 0400d939c6..211a65c1f6 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -154,7 +154,7 @@
#define LIBAVUTIL_VERSION_MAJOR 51
#define LIBAVUTIL_VERSION_MINOR 19
-#define LIBAVUTIL_VERSION_MICRO 1
+#define LIBAVUTIL_VERSION_MICRO 2
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \