From 1d2449a613f7dc6da27a237abdca7dde235cef65 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Tue, 6 Dec 2011 15:38:55 -0500 Subject: audioconvert: change 7.1 "wide" layout to use side surround channels --- libavutil/audioconvert.h | 2 +- libavutil/avutil.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libavutil') 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, \ -- cgit v1.2.3