Changeset 1313 in 3DVCSoftware for trunk/source/App/utils/BitrateTargeting/ExtractBitrates.h

Timestamp:

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

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/App/utils/BitrateTargeting/ExtractBitrates.h (modified) (4 diffs)

trunk/source/App/utils/BitrateTargeting/ExtractBitrates.h

@@ -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.  
+ * granted under this license.
  *
- * Copyright (c) 2010-2014, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -32 +32 @@
  */
 
-#ifndef EXTRACT_BITRATES_H
-#define EXTRACT_BITRATES_H
+#ifndef __EXTRACTBITRATES__
+#define __EXTRACTBITRATES__
 
 #include "RuntimeError.h"
@@ -44 +44 @@
     POCParseException( const std::string& pocLine ): m_pocLine( pocLine ) { }
     virtual ~POCParseException( ) throw ( ) { }
-  
+
   protected:
     void outputWhat( std::ostream& o ) const { o << "POC parse exception: " << m_pocLine; }
-  
+
   private:
     std::string m_pocLine;
@@ -57 +57 @@
   public:
     virtual ~NonContiguousQPSetException( ) throw( ) { }
-  
+
   protected:
     void outputWhat( std::ostream& o ) const { o << "Non-contiguous QP set exception"; }