Don't re-use J2K data if it's the wrong size (#964).

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 15d7b3df7..33c2a21f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-09-26  c.hetherington  <cth@carlh.net>
+
+	* Don't re-use J2K data if it's the wrong size (#964).
+
 2016-09-23  Carl Hetherington  <cth@carlh.net>
 
 	* Version 2.9.27 released.
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 17d3dc522..8075b7b7d 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -191,7 +191,7 @@ PlayerVideo::has_j2k () const
 		return false;
 	}
 
-	return _crop == Crop () && _inter_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion;
+	return _crop == Crop () && _out_size == j2k->size() && !_subtitle && !_fade && !_colour_conversion;
 }
 
 Data