summaryrefslogtreecommitdiff
path: root/src/lib/transcoder.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-29 23:19:04 +0100
committerCarl Hetherington <cth@carlh.net>2015-07-01 17:27:02 +0100
commitc5b9ad09ab5eaf032b0816f619ab5d75254e8597 (patch)
tree2d1cba3086b6448f454ecac9d1dd0875a12b5214 /src/lib/transcoder.cc
parentf9fcc34179a6f86425427741c60d8876099d3ed3 (diff)
Go back to player having a playlist and not assuming it uses the film's content.
Diffstat (limited to 'src/lib/transcoder.cc')
-rw-r--r--src/lib/transcoder.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index fd216c101..e0af2c594 100644
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -50,7 +50,7 @@ using boost::dynamic_pointer_cast;
*/
Transcoder::Transcoder (shared_ptr<const Film> film, shared_ptr<Job> j)
: _film (film)
- , _player (new Player (film))
+ , _player (new Player (film, film->playlist ()))
, _writer (new Writer (film, j))
, _encoder (new Encoder (film, j, _writer))
, _finishing (false)
@@ -112,4 +112,3 @@ Transcoder::video_frames_out () const
{
return _encoder->video_frames_out ();
}
-