Re: [libav-devel] [PATCH 2/2] flac: add channel layout masks for streams with 7 or 8 channels.

2013-02-06 Thread Tim W. 
Ping.
___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

[libav-devel] [PATCH 2/2] flac: add channel layout masks for streams with 7 or 8 channels.

2013-01-22 Thread Tim Walker 
They were added to the latest FLAC specification:
https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
---
 libavcodec/flac.c|6 --
 libavcodec/version.h |2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index 32b28d0..aa322b4 100644
--- a/libavcodec/flac.c
+++ b/libavcodec/flac.c
@@ -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)
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 62f2bcd..1b1c403 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,7 +28,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 54
 #define LIBAVCODEC_VERSION_MINOR 40
-#define LIBAVCODEC_VERSION_MICRO  0
+#define LIBAVCODEC_VERSION_MICRO  1
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
-- 
1.7.10.2 (Apple Git-33)

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Re: [libav-devel] [PATCH 2/2] flac: add channel layout masks for streams with 7 or 8 channels.

2013-01-22 Thread Justin Ruggles 
On 01/22/2013 03:53 PM, Tim Walker wrote:
 They were added to the latest FLAC specification:
 https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2
 ---
  libavcodec/flac.c|6 --
  libavcodec/version.h |2 +-
  2 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/libavcodec/flac.c b/libavcodec/flac.c
 index 32b28d0..aa322b4 100644
 --- a/libavcodec/flac.c
 +++ b/libavcodec/flac.c
 @@ -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)
 diff --git a/libavcodec/version.h b/libavcodec/version.h
 index 62f2bcd..1b1c403 100644
 --- a/libavcodec/version.h
 +++ b/libavcodec/version.h
 @@ -28,7 +28,7 @@
  
  #define LIBAVCODEC_VERSION_MAJOR 54
  #define LIBAVCODEC_VERSION_MINOR 40
 -#define LIBAVCODEC_VERSION_MICRO  0
 +#define LIBAVCODEC_VERSION_MICRO  1
  
  #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
 LIBAVCODEC_VERSION_MINOR, \

LGTM

-Justin

___
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel