projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
encoder.cc
diff --git
a/src/lib/encoder.cc
b/src/lib/encoder.cc
index 4dff19ea6dbd8bc93f0fd7573c77cc206e6768e5..d3181acd9b1f7df35f0224a96be318b6203f5f1d 100644
(file)
--- 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::vector;
using std::list;
using std::cout;
+using std::min;
using std::make_pair;
using boost::shared_ptr;
using boost::optional;
using std::make_pair;
using boost::shared_ptr;
using boost::optional;
@@
-47,7
+48,7
@@
using boost::optional;
int const Encoder::_history_size = 25;
/** @param f Film that we are encoding */
int const Encoder::_history_size = 25;
/** @param f Film that we are encoding */
-Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Job> j)
+Encoder::Encoder (shared_ptr<
const
Film> f, shared_ptr<Job> j)
: _film (f)
, _job (j)
, _video_frames_out (0)
: _film (f)
, _job (j)
, _video_frames_out (0)
@@
-169,7
+170,7
@@
Encoder::frame_done ()
}
void
}
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);
{
boost::mutex::scoped_lock lock (_mutex);
@@
-215,7
+216,7
@@
Encoder::process_video (shared_ptr<const Image> image, bool same, Time)
}
void
}
void
-Encoder::process_audio (shared_ptr<const AudioBuffers> data
, Time
)
+Encoder::process_audio (shared_ptr<const AudioBuffers> data)
{
_writer->write (data);
}
{
_writer->write (data);
}