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

diff --git a/ChangeLog b/ChangeLog
index 15d7b3df78d7f3a4407cabcbe1a57aa6e9d58893..33c2a21f91051fc7c5ccb5a9052ab90da57b5eb3 100644 (file)
--- 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 17d3dc52270db80dc48cd782d3bc29ce9b8ce6b0..8075b7b7d437dee5f6cf94c27fb6f2ab78d1a249 100644 (file)
--- 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