projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
lib
/
ffmpeg_encoder.cc
diff --git
a/src/lib/ffmpeg_encoder.cc
b/src/lib/ffmpeg_encoder.cc
index fc0d5eab26350f8ee6d257043b9ff2da12a64bf4..61ca1ae008bc47fa99c92178ec5a863be0ef28be 100644
(file)
--- a/
src/lib/ffmpeg_encoder.cc
+++ b/
src/lib/ffmpeg_encoder.cc
@@
-183,7
+183,7
@@
FFmpegEncoder::go ()
}
auto fe = encoder->get (v.first->eyes());
if (fe) {
}
auto fe = encoder->get (v.first->eyes());
if (fe) {
- fe->video(v.first, v.second);
+ fe->video(v.first, v.second
- reel->from
);
}
}
}
}
@@
-273,11
+273,11
@@
FFmpegEncoder::FileEncoderSet::get (Eyes eyes) const
eyes = Eyes::BOTH;
} else if (eyes == Eyes::RIGHT) {
/* ...and ignore the right eye.*/
eyes = Eyes::BOTH;
} else if (eyes == Eyes::RIGHT) {
/* ...and ignore the right eye.*/
- return
shared_ptr<FFmpegFileEncoder>()
;
+ return
{}
;
}
}
}
}
-
map<Eyes, std::shared_ptr<FFmpegFileEncoder> >::const_iterator
i = _encoders.find (eyes);
+
auto
i = _encoders.find (eyes);
DCPOMATIC_ASSERT (i != _encoders.end());
return i->second;
}
DCPOMATIC_ASSERT (i != _encoders.end());
return i->second;
}