projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master; fix crash on new film.
[dcpomatic.git]
/
src
/
lib
/
matcher.cc
diff --git
a/src/lib/matcher.cc
b/src/lib/matcher.cc
index 9924c003ae5b81298ef27653e5ba015d7d312307..c56a563015b6eb617bf38535ff81be81c7cffeb0 100644
(file)
--- a/
src/lib/matcher.cc
+++ b/
src/lib/matcher.cc
@@
-41,7
+41,7
@@
Matcher::Matcher (shared_ptr<Log> log, int sample_rate, float frames_per_second)
}
void
}
void
-Matcher::process_video (
boost::
shared_ptr<const Image> image, bool same, boost::shared_ptr<Subtitle> sub, double t)
+Matcher::process_video (shared_ptr<const Image> image, bool same, boost::shared_ptr<Subtitle> sub, double t)
{
_pixel_format = image->pixel_format ();
_size = image->size ();
{
_pixel_format = image->pixel_format ();
_size = image->size ();
@@
-90,7
+90,7
@@
Matcher::process_video (boost::shared_ptr<const Image> image, bool same, boost::
}
void
}
void
-Matcher::process_audio (
boost::
shared_ptr<const AudioBuffers> b, double t)
+Matcher::process_audio (shared_ptr<const AudioBuffers> b, double t)
{
_channels = b->channels ();
{
_channels = b->channels ();