From: Carl Hetherington <cth@carlh.net>
Date: Mon, 3 Aug 2020 07:51:12 +0000 (+0200)
Subject: Fix incorrect string find logic.
X-Git-Tag: v2.14.36~2
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=75820f6fe6d1d2de7546694c6c875c24b40478bf;hp=f03eed89e4a2d95926086d6dc4152d2229db3791;p=dcpomatic.git

Fix incorrect string find logic.

Backported-from-commit: d461077cf4f2c1470d2d0d6dbc4f5708411bec65
Backported-from-branch: v2.15.x
---

diff --git a/src/lib/ffmpeg_examiner.cc b/src/lib/ffmpeg_examiner.cc
index 1a2c49f1c..d439b0eb6 100644
--- a/src/lib/ffmpeg_examiner.cc
+++ b/src/lib/ffmpeg_examiner.cc
@@ -182,7 +182,7 @@ FFmpegExaminer::FFmpegExaminer (shared_ptr<const FFmpegContent> c, shared_ptr<Jo
 	}
 
 	LOG_GENERAL("Temporal reference was %1", temporal_reference);
-	if (temporal_reference.find("T2T3B2B3T2T3B2B3") || temporal_reference.find("B2B3T2T3B2B3T2T3")) {
+	if (temporal_reference.find("T2T3B2B3T2T3B2B3") != string::npos || temporal_reference.find("B2B3T2T3B2B3T2T3") != string::npos) {
 		/* The magical sequence (taken from mediainfo) suggests that 2:3 pull-down is in use */
 		_pulldown = true;
 		LOG_GENERAL_NC("Suggest that this may be 2:3 pull-down (soft telecine)");