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_content.cc | |
| parent | d0bca7d33b8101cd87f78d5a76b2512dea3988f8 (diff) | |
| parent | 4e5d5c7dcc6470b8dc918d03a00e30c07df60efe (diff) | |
Merge 1.0-seek and subtitle-content.
Diffstat (limited to 'src/lib/subrip_content.cc')
| -rw-r--r-- | src/lib/subrip_content.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/subrip_content.cc b/src/lib/subrip_content.cc index b13f64ded..48d3528e1 100644 --- a/src/lib/subrip_content.cc +++ b/src/lib/subrip_content.cc @@ -76,7 +76,7 @@ SubRipContent::as_xml (xmlpp::Node* node) SubtitleContent::as_xml (node); } -Time +DCPTime SubRipContent::full_length () const { /* XXX: this assumes that the timing of the SubRip file is appropriate |