update .clang-format

generated by version 3.8.1
local changes from --style=Google

3a4
> # Generated with clang-format 3.8.1
10c11
< AlignTrailingComments: true
---
> AlignTrailingComments: false
15,16c16,17
< AllowShortIfStatementsOnASingleLine: true
< AllowShortLoopsOnASingleLine: true
---
> AllowShortIfStatementsOnASingleLine: false
> AllowShortLoopsOnASingleLine: false
37c38
< BreakBeforeTernaryOperators: true
---
> BreakBeforeTernaryOperators: false

Change-Id: I4ded7e36fb8bd5407cfba6d1c4f86e0bec620c0c

.clang-format

@@ -1,53 +1,91 @@
 ---
 Language:        Cpp
 # BasedOnStyle:  Google
+# Generated with clang-format 3.8.1
 AccessModifierOffset: -1
-ConstructorInitializerIndentWidth: 4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
 AlignEscapedNewlinesLeft: true
+AlignOperands:   true
 AlignTrailingComments: false
 AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
 AllowShortIfStatementsOnASingleLine: false
 AllowShortLoopsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakTemplateDeclarations: true
+AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: true
-BreakBeforeBinaryOperators: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializersBeforeComma: false
-BinPackParameters: true
 ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
-DerivePointerBinding: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: true
+DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeCategories:
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
 IndentCaseLabels: true
-MaxEmptyLinesToKeep: 1
+IndentWidth:     2
+IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
 NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
 ObjCSpaceAfterProperty: false
 ObjCSpaceBeforeProtocolList: false
 PenaltyBreakBeforeFirstCallParameter: 1
 PenaltyBreakComment: 300
-PenaltyBreakString: 1000
 PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
-PointerBindsToType: true
+PointerAlignment: Left
+ReflowComments:  true
+SortIncludes:    true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 2
-Cpp11BracedListStyle: true
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
 Standard:        Auto
-IndentWidth:     2
 TabWidth:        8
 UseTab:          Never
-BreakBeforeBraces: Attach
-IndentFunctionDeclarationAfterType: true
-SpacesInParentheses: false
-SpacesInAngles:  false
-SpaceInEmptyParentheses: false
-SpacesInCStyleCastParentheses: false
-SpacesInContainerLiterals: true
-SpaceBeforeAssignmentOperators: true
-ContinuationIndentWidth: 4
-CommentPragmas:  '^ IWYU pragma:'
-SpaceBeforeParens: ControlStatements
 ...
 

mkvparser/mkvparser.cc

@@ -4117,7 +4117,7 @@ ContentEncoding::~ContentEncoding() {
 }
 
 const ContentEncoding::ContentCompression*
-    ContentEncoding::GetCompressionByIndex(unsigned long idx) const {
+ContentEncoding::GetCompressionByIndex(unsigned long idx) const {
   const ptrdiff_t count = compression_entries_end_ - compression_entries_;
   assert(count >= 0);
 

webm_parser/demo/demo.cc

@@ -1132,7 +1132,8 @@ class DemoCallback : public Callback {
 int main(int argc, char* argv[]) {
   if ((argc != 1 && argc != 2) ||
       (argc == 2 && argv[1] == std::string("--help"))) {
-    std::cerr << "Usage:\n" << argv[0] << " [path-to-webm-file]\n\n"
+    std::cerr << "Usage:\n"
+              << argv[0] << " [path-to-webm-file]\n\n"
               << "Prints info for the WebM file specified in the command line. "
                  "If no file is\n"
               << "specified, stdin is used as input.\n";

webm_parser/include/webm/istream_reader.h

@@ -45,8 +45,7 @@ class IstreamReader : public Reader {
    reference derived from `std::istream`.
    */
   template <typename T>
-  explicit IstreamReader(T&& istream)
+  explicit IstreamReader(T&& istream) : istream_(new T(std::move(istream))) {}
-      : istream_(new T(std::move(istream))) {}
 
   /**
    Constructs a new reader by moving the provided reader into the new reader.

webm_parser/src/ancestory.h

@@ -60,7 +60,7 @@ class Ancestory {
   // Constructs an Ancestory using the first count elements of ancestory.
   // ancestory must have static storage duration.
   template <std::size_t N>
-  Ancestory(const Id(&ancestory)[N], std::size_t count)
+  Ancestory(const Id (&ancestory)[N], std::size_t count)
       : begin_(ancestory), end_(ancestory + count) {
     assert(count <= N);
   }

webm_parser/tests/istream_reader_test.cc

@@ -23,7 +23,7 @@ namespace {
 // Creates a std::array from a string literal (and omits the trailing
 // NUL-character).
 template <std::size_t N>
-std::array<std::uint8_t, N - 1> ArrayFromString(const char(&string)[N]) {
+std::array<std::uint8_t, N - 1> ArrayFromString(const char (&string)[N]) {
   std::array<std::uint8_t, N - 1> array;
   std::copy_n(string, N - 1, array.begin());
   return array;