summaryrefslogtreecommitdiff
path: root/src/lib/ffmpeg_content.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-07-30 21:34:16 +0100
committerCarl Hetherington <cth@carlh.net>2013-07-30 21:34:16 +0100
commitc57e92b12c64d4ad1a7f23876a97471565f9a252 (patch)
tree008213d35e4be34c55caa51760ab7aef6fa33113 /src/lib/ffmpeg_content.cc
parente241b3d295fe4158239170f17391e08473e159c5 (diff)
Somewhat untested and sketchy basics of trimming.
Diffstat (limited to 'src/lib/ffmpeg_content.cc')
-rw-r--r--src/lib/ffmpeg_content.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index 84be76d27..de967c045 100644
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -346,7 +346,7 @@ FFmpegSubtitleStream::as_xml (xmlpp::Node* root) const
}
Time
-FFmpegContent::length () const
+FFmpegContent::full_length () const
{
shared_ptr<const Film> film = _film.lock ();
assert (film);