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..b5ab2d233918ecbe542c83564bfc747d3cd7c963 100644
(file)
--- a/
src/lib/piece.h
+++ b/
src/lib/piece.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-21,7
+22,6
@@
#define DCPOMATIC_PIECE_H
#include "types.h"
#define DCPOMATIC_PIECE_H
#include "types.h"
-#include "video_content.h"
class Content;
class Decoder;
class Content;
class Decoder;
@@
-34,7
+34,7
@@
public:
, decoder (d)
, frc (f)
{}
, decoder (d)
, frc (f)
{}
-
+
boost::shared_ptr<Content> content;
boost::shared_ptr<Decoder> decoder;
FrameRateChange frc;
boost::shared_ptr<Content> content;
boost::shared_ptr<Decoder> decoder;
FrameRateChange frc;