projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix problems with FFmpeg files that have all-zero stream IDs.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index 9875a179b45152407b73ffeead41317a670f4de1..686aaa2f25e4977d16644813016e0f0550e208c3 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-58,7
+58,7
@@
class ServerFinder;
class Encoder : public boost::noncopyable
{
public:
class Encoder : public boost::noncopyable
{
public:
- Encoder (boost::shared_ptr<const Film> f, boost::
shared
_ptr<Job>);
+ Encoder (boost::shared_ptr<const Film> f, boost::
weak
_ptr<Job>);
virtual ~Encoder ();
/** Called to indicate that a processing run is about to begin */
virtual ~Encoder ();
/** Called to indicate that a processing run is about to begin */
@@
-90,7
+90,7
@@
private:
/** Film that we are encoding */
boost::shared_ptr<const Film> _film;
/** Film that we are encoding */
boost::shared_ptr<const Film> _film;
- boost::
shared
_ptr<Job> _job;
+ boost::
weak
_ptr<Job> _job;
/** Mutex for _time_history and _last_frame */
mutable boost::mutex _state_mutex;
/** Mutex for _time_history and _last_frame */
mutable boost::mutex _state_mutex;