projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
[dcpomatic.git]
/
src
/
lib
/
piece.h
diff --git
a/src/lib/piece.h
b/src/lib/piece.h
index 976409381d3a8744c69f5f14e53f67a5ca688e08..cebc3fb1416dc1dcd72d852f7efab1369fa993f7 100644
(file)
--- a/
src/lib/piece.h
+++ b/
src/lib/piece.h
@@
-21,7
+21,6
@@
#define DCPOMATIC_PIECE_H
#include "types.h"
-#include "video_content.h"
class Content;
class Decoder;
@@
-34,7
+33,7
@@
public:
, decoder (d)
, frc (f)
{}
-
+
boost::shared_ptr<Content> content;
boost::shared_ptr<Decoder> decoder;
FrameRateChange frc;