projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reject certificate chains where the adjacent certificates have the same subject.
[libdcp.git]
/
src
/
mono_picture_asset.cc
diff --git
a/src/mono_picture_asset.cc
b/src/mono_picture_asset.cc
index 407a3614de88231a2df313bb59296422e4c6648c..5a01491013e28a4112f9e32c0ba10f372b29f35d 100644
(file)
--- a/
src/mono_picture_asset.cc
+++ b/
src/mono_picture_asset.cc
@@
-73,8
+73,8
@@
MonoPictureAsset::MonoPictureAsset (boost::filesystem::path file)
_id = read_writer_info (info);
}
_id = read_writer_info (info);
}
-MonoPictureAsset::MonoPictureAsset (Fraction edit_rate)
- : PictureAsset (edit_rate)
+MonoPictureAsset::MonoPictureAsset (Fraction edit_rate
, Standard standard
)
+ : PictureAsset (edit_rate
, standard
)
{
}
{
}
@@
-167,16
+167,16
@@
MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
}
shared_ptr<PictureAssetWriter>
}
shared_ptr<PictureAssetWriter>
-MonoPictureAsset::start_write (boost::filesystem::path file,
Standard standard,
bool overwrite)
+MonoPictureAsset::start_write (boost::filesystem::path file, bool overwrite)
{
/* XXX: can't we use shared_ptr here? */
{
/* XXX: can't we use shared_ptr here? */
- return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, file,
standard,
overwrite));
+ return shared_ptr<MonoPictureAssetWriter> (new MonoPictureAssetWriter (this, file, overwrite));
}
shared_ptr<MonoPictureAssetReader>
MonoPictureAsset::start_read () const
{
}
shared_ptr<MonoPictureAssetReader>
MonoPictureAsset::start_read () const
{
- return shared_ptr<MonoPictureAssetReader> (new MonoPictureAssetReader (this, key
()));
+ return shared_ptr<MonoPictureAssetReader> (new MonoPictureAssetReader (this, key
(), standard
()));
}
string
}
string