diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-07-27 18:41:09 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-07-28 10:04:09 +0200 |
| commit | e2affa8ce7491253810117a8f0b22aada1f5cea6 (patch) | |
| tree | 06280cc185649c202760760bf4b9bbfcadeba4ac /libavutil | |
| parent | 44187717c1611695ff441d22f29c7882bd318ae4 (diff) | |
| download | ffmpeg-e2affa8ce7491253810117a8f0b22aada1f5cea6.tar.gz | |
audioconvert: define unique strings for AV_CH_LAYOUT_5POINT{0,1}_BACK
Previously the string for AV_CH_LAYOUT_5POINT{0,1}_BACK was the same
of the string for AV_CH_LAYOUT_5POINT{0,1}.
This is required for discerning the two channel layouts, given a
channel layout string.
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/audioconvert.c | 4 | ||||
| -rw-r--r-- | libavutil/avutil.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c index 60743de22a..6e8649d56c 100644 --- a/libavutil/audioconvert.c +++ b/libavutil/audioconvert.c @@ -52,9 +52,9 @@ static const struct { { "4.0", 4, AV_CH_LAYOUT_4POINT0 }, { "quad", 4, AV_CH_LAYOUT_QUAD }, { "5.0", 5, AV_CH_LAYOUT_5POINT0 }, - { "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK }, + { "5.0(back)", 5, AV_CH_LAYOUT_5POINT0_BACK }, { "5.1", 6, AV_CH_LAYOUT_5POINT1 }, - { "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK }, + { "5.1(back)", 6, AV_CH_LAYOUT_5POINT1_BACK }, { "5.1+downmix", 8, AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, }, { "7.1", 8, AV_CH_LAYOUT_7POINT1 }, { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE }, diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 568f66b989..ffcac1c152 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -41,7 +41,7 @@ #define LIBAVUTIL_VERSION_MAJOR 51 #define LIBAVUTIL_VERSION_MINOR 11 -#define LIBAVUTIL_VERSION_MICRO 0 +#define LIBAVUTIL_VERSION_MICRO 1 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |