diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-20 13:23:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-20 13:23:26 +0100 |
| commit | 39bc73fe192f932ed6695eb87b19de446e8b4f55 (patch) | |
| tree | 4811b0642b7fcd73206b037da4ffb342e90ce6dc /src/lib/transcoder.cc | |
| parent | bb0a36c3a6bea9cd1ebdde7b8a3a04765e317569 (diff) | |
| parent | 884093edac5f63d26c02d411c73dfb52376ccf8f (diff) | |
Merge master.
Diffstat (limited to 'src/lib/transcoder.cc')
| -rw-r--r-- | src/lib/transcoder.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc index cc41b4256..a4cd36a4f 100644 --- a/src/lib/transcoder.cc +++ b/src/lib/transcoder.cc @@ -61,8 +61,8 @@ Transcoder::go () DCPTime const frame = DCPTime::from_frames (1, _film->video_frame_rate ()); for (DCPTime t; t < _film->length(); t += frame) { - list<shared_ptr<DCPVideo> > v = _player->get_video (t, true); - for (list<shared_ptr<DCPVideo> >::const_iterator i = v.begin(); i != v.end(); ++i) { + list<shared_ptr<PlayerVideoFrame> > v = _player->get_video (t, true); + for (list<shared_ptr<PlayerVideoFrame> >::const_iterator i = v.begin(); i != v.end(); ++i) { _encoder->process_video (*i); } _encoder->process_audio (_player->get_audio (t, frame, true)); |