[Summary] Merging from GIT

[Details] Starting point:
Mar 24 2014, 11:47 PM
Commit: 87184ab80d

Target point:
Commit: 59e6694405
Apr 16 2014, 4:01 PM

[git-p4: depot-paths = "//Abdaw/dev_main/tracks/": change = 453690]
This commit is contained in:
Grygorii Zharun 2014-04-18 04:21:54 -05:00
parent 0046ee6488
commit ce2a519afa
103 changed files with 2160 additions and 915 deletions

View file

@ -19,6 +19,7 @@
#ifndef __timecode_time_h__
#define __timecode_time_h__
#include <cmath>
#include <ostream>
#include <inttypes.h>
@ -68,6 +69,7 @@ struct LIBTIMECODE_API Time {
frames = 0;
subframes = 0;
rate = a_rate;
drop = (lrintf(100.f * (float)a_rate) == (long)2997);
}
bool operator== (const Time& other) const {