Changeset 1313 in 3DVCSoftware for trunk/source/App/utils/annexBbytecount.cpp

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/App/utils/annexBbytecount.cpp (modified) (6 diffs)

trunk/source/App/utils/annexBbytecount.cpp

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.  
- *
- * Copyright (c) 2010-2014, ITU/ISO/IEC
+ * granted under this license.
+ *
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -43 +43 @@
 using namespace std;
 
-static struct {
+static const struct {
   AnnexBStats expected;
   unsigned data_len;
@@ -86 +86 @@
       cout << hex << (unsigned int)tests[i].data[j] << dec;
       if (j < tests[i].data_len-1)
+      {
         cout << ",";
+      }
     }
     cout << "} ";
@@ -103 +105 @@
 #undef VERIFY
     if (ok)
+    {
       cout << "OK";
+    }
     cout << endl;
   }
@@ -113 +117 @@
 
   if (argc != 2)
+  {
     return 0;
+  }
 
   ifstream in(argv[1], ifstream::in | ifstream::binary);
@@ -150 +156 @@
 
     if (!annexBStatsSingle.m_numBytesInNALUnit)
+    {
       continue;
+    }
 
     /* identify the NAL unit type and add stats to the correct