diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-12 01:37:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-04-12 01:37:00 +0100 |
| commit | 4b8c626b7e66ab1d4d69606e10316542c8873842 (patch) | |
| tree | 94140f93b3911196ab60866fefb5c9f807a7a2ab /src/mono_picture_asset.cc | |
| parent | 4b8eee1359d817937b84df7e88126fa16040e5c9 (diff) | |
Add direction support for SMPTE subtitles; fix pragma warnings with non-openmp builds.
Diffstat (limited to 'src/mono_picture_asset.cc')
| -rw-r--r-- | src/mono_picture_asset.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc index b367a19d..8e09d8c6 100644 --- a/src/mono_picture_asset.cc +++ b/src/mono_picture_asset.cc @@ -113,7 +113,10 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No bool result = true; +#ifdef LIBDCP_OPENMP #pragma omp parallel for +#endif + for (int i = 0; i < _intrinsic_duration; ++i) { if (i >= other_picture->intrinsic_duration()) { result = false; @@ -134,7 +137,9 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No result = false; } +#ifdef LIBDCP_OPENMP #pragma omp critical +#endif { note (DCP_PROGRESS, String::compose ("Compared video frame %1 of %2", i, _intrinsic_duration)); for (list<pair<NoteType, string> >::const_iterator i = notes.begin(); i != notes.end(); ++i) { |