From 08a0c3870453e931c88db48f235cb402b4a87840 Mon Sep 17 00:00:00 2001
From: tomkat83 <kathriner.thomas@gmail.com>
Date: Sun, 10 Jan 2016 12:38:49 +0100
Subject: [PATCH] Resolving merge conflict

---
 resources/lib/playutils.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/resources/lib/playutils.py b/resources/lib/playutils.py
index 405819aa..6e3b5784 100644
--- a/resources/lib/playutils.py
+++ b/resources/lib/playutils.py
@@ -101,10 +101,6 @@ class PlayUtils():
             return False
 
         if not self.h265enabled():
-        if (utils.settings('transcodeHEVC') == "true" and
-                item['MediaSources'][0]['Name'].startswith("1080P/HEVC")):
-            # Avoid HEVC(H265) 1080p
-            self.logMsg("Option to transcode 1080P/HEVC enabled.", 1)
             return False
 
         # Found with e.g. trailers
@@ -159,11 +155,11 @@ class PlayUtils():
         videoCodec = self.API.getVideoCodec()
         codec = videoCodec['videocodec']
         resolution = videoCodec['resolution']
-        if ((utils.settings('transcodeH265') == "true") and
-                ("h265" in codec) and
+        if ((utils.settings('transcodeHEVC') == "true") and
+                ("hevc" in codec) and
                 (resolution == "1080")):
-            # Avoid H265 1080p
-            self.logMsg("Option to transcode 1080P/H265 enabled.", 0)
+            # Avoid HEVC(H265) 1080p
+            self.logMsg("Option to transcode 1080P/HEVC enabled.", 0)
             return False
         else:
             return True