Browse Source

flac: add channel layout masks for streams with 7 or 8 channels.

They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2

Signed-off-by: Anton Khirnov <anton@khirnov.net>
tags/n1.2
Tim Walker Anton Khirnov 13 years ago
parent
commit
9d083d6417
2 changed files with 5 additions and 3 deletions
  1. +4
    -2
      libavcodec/flac.c
  2. +1
    -1
      libavcodec/version.h

+ 4
- 2
libavcodec/flac.c View File

@@ -29,13 +29,15 @@

static const int8_t sample_size_table[] = { 0, 8, 12, 0, 16, 20, 24, 0 };

static const int64_t flac_channel_layouts[6] = {
static const uint64_t flac_channel_layouts[8] = {
AV_CH_LAYOUT_MONO,
AV_CH_LAYOUT_STEREO,
AV_CH_LAYOUT_SURROUND,
AV_CH_LAYOUT_QUAD,
AV_CH_LAYOUT_5POINT0,
AV_CH_LAYOUT_5POINT1
AV_CH_LAYOUT_5POINT1,
AV_CH_LAYOUT_6POINT1,
AV_CH_LAYOUT_7POINT1
};

static int64_t get_utf8(GetBitContext *gb)


+ 1
- 1
libavcodec/version.h View File

@@ -28,7 +28,7 @@

#define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR 41
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_MICRO 1

#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \


Loading…
Cancel
Save