Context navigation

← Previous change
Next change →

Changeset 1029 in SHVCSoftware for branches/SHM-dev/source/App/utils/BitrateTargeting

Timestamp:

26 Feb 2015, 00:21:54 (10 years ago)

Author:

seregin

Message:

merge with SHM-upgrade branch

Location:

branches/SHM-dev

Files:

: 5 edited

. (modified) (1 prop)
source (modified) (1 prop)
source/App/utils/BitrateTargeting/ExtractBitrates.h (modified) (1 diff)
source/App/utils/BitrateTargeting/GuessLambdaModifiers.h (modified) (1 diff)
source/App/utils/BitrateTargeting/RuntimeError.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/SHM-dev

Property svn:mergeinfo changed

/branches/SHM-upgrade (added)

merged: 915-922,926-929,931,933,935-936,938-940,945-948,955-957,959,961-963,965,967,970,972,974-975,977,979,981,983,985,987,989,992,994,996,998,1000,1002-1003,1006,1008,1010,1012,1014,1016,1018-1019,1021-1022,1024,1027-1028

branches/SHM-dev/source

Property svn:mergeinfo changed

/branches/SHM-upgrade/source (added)

merged: 916-919,921-922,926,928-929,931,933,935-936,938-940,945-948,955-957,959,961-963,965,967,970,972,974,977,979,981,983,985,987,989,992,994,996,998,1000,1002-1003,1006,1008,1010,1012,1014,1016,1018-1019,1021-1022,1024,1027-1028

branches/SHM-dev/source/App/utils/BitrateTargeting/ExtractBitrates.h

-                      r595
+                      r1029
  */
 #ifndef EXTRACT_BITRATES_H
 #define EXTRACT_BITRATES_H
+#ifndef __EXTRACTBITRATES__
+#define __EXTRACTBITRATES__
 #include "RuntimeError.h"

branches/SHM-dev/source/App/utils/BitrateTargeting/GuessLambdaModifiers.h

-                      r595
+                      r1029
  */
 #ifndef CALCULATE_LAMBDA_MODIFIER_H
 #define CALCULATE_LAMBDA_MODIFIER_H
+#ifndef __GUESSLAMBDAMODIFIERS__
+#define __GUESSLAMBDAMODIFIERS__
 #include "RuntimeError.h"

branches/SHM-dev/source/App/utils/BitrateTargeting/RuntimeError.h

-                      r595
+                      r1029
  */
 #ifndef DIRECTORY_LIB_RUNTIME_ERROR_H
 #define DIRECTORY_LIB_RUNTIME_ERROR_H
+#ifndef __RUNTIMEERROR__
+#define __RUNTIMEERROR__
 #include <sstream>

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: