projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply FFmpeg palette fix to examination too; fix build with old FFmpeg.
[dcpomatic.git]
/
src
/
lib
/
referenced_reel_asset.h
diff --git
a/src/lib/referenced_reel_asset.h
b/src/lib/referenced_reel_asset.h
index 1479ade5d27c85df800b4ddffbfc77665b816a45..0d66155b53fb51e13680bd0c1a07f8e01cecb50f 100644
(file)
--- a/
src/lib/referenced_reel_asset.h
+++ b/
src/lib/referenced_reel_asset.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2015 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/>.
*/
*/
@@
-25,7
+26,7
@@
class ReferencedReelAsset
{
public:
class ReferencedReelAsset
{
public:
- ReferencedReelAsset (boost::shared_ptr<dcp::ReelAsset> asset_, DCPTimePeriod period_)
+ ReferencedReelAsset (boost::shared_ptr<dcp::ReelAsset> asset_,
dcpomatic::
DCPTimePeriod period_)
: asset (asset_)
, period (period_)
{}
: asset (asset_)
, period (period_)
{}
@@
-33,7
+34,7
@@
public:
/** The asset */
boost::shared_ptr<dcp::ReelAsset> asset;
/** Period that this asset covers in the DCP */
/** The asset */
boost::shared_ptr<dcp::ReelAsset> asset;
/** Period that this asset covers in the DCP */
- DCPTimePeriod period;
+
dcpomatic::
DCPTimePeriod period;
};
#endif
};
#endif