X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fencoder.cc;h=ed14f2755f5798013d20ae1048118e7f2e985f1d;hb=75cd462257fbec6c6998f2d1339e37ab4ff16f31;hp=8b2db0eb3113767594264b6ca8367e2022bbbe8b;hpb=5fd5e78c51bd5630f6777001db5aa25103218c22;p=dcpomatic.git

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 8b2db0eb3..ed14f2755 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -40,6 +40,7 @@ using std::stringstream;
 using std::vector;
 using std::list;
 using std::cout;
+using std::min;
 using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
@@ -169,7 +170,7 @@ Encoder::frame_done ()
 }
 
 void
-Encoder::process_video (shared_ptr<const Image> image, bool same, Time)
+Encoder::process_video (shared_ptr<const Image> image, bool same)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
@@ -199,7 +200,6 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, Time)
 	} else {
 		/* Queue this new frame for encoding */
 		TIMING ("adding to queue of %1", _queue.size ());
-		/* XXX: padding */
 		_queue.push_back (shared_ptr<DCPVideoFrame> (
 					  new DCPVideoFrame (
 						  image, _video_frames_out, _film->dcp_video_frame_rate(),
@@ -215,7 +215,7 @@ Encoder::process_video (shared_ptr<const Image> image, bool same, Time)
 }
 
 void
-Encoder::process_audio (shared_ptr<const AudioBuffers> data, Time)
+Encoder::process_audio (shared_ptr<const AudioBuffers> data)
 {
 	_writer->write (data);
 }