diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-01-15 21:23:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-01-15 21:23:33 +0000 |
| commit | 8353a009aae1a604251c0160193c39741c2fa27c (patch) | |
| tree | 558d2b1951f2b4f05f0ab93b46d10afd0ebee929 /src/lib/subrip_subtitle.h | |
| parent | d0bca7d33b8101cd87f78d5a76b2512dea3988f8 (diff) | |
| parent | 4e5d5c7dcc6470b8dc918d03a00e30c07df60efe (diff) | |
Merge 1.0-seek and subtitle-content.
Diffstat (limited to 'src/lib/subrip_subtitle.h')
| -rw-r--r-- | src/lib/subrip_subtitle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/subrip_subtitle.h b/src/lib/subrip_subtitle.h index 933e0fc02..f730ee492 100644 --- a/src/lib/subrip_subtitle.h +++ b/src/lib/subrip_subtitle.h @@ -46,8 +46,8 @@ struct SubRipSubtitle , to (0) {} - Time from; - Time to; + ContentTime from; + ContentTime to; boost::optional<int> x1; boost::optional<int> x2; boost::optional<int> y1; |