Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Resolving merge conflict

Browse source
This commit is contained in:
tomkat83 2016-01-10 12:38:49 +01:00
parent 0c444beab0
commit 08a0c38704
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resources/lib/playutils.py
View file

@ -101,10 +101,6 @@ class PlayUtils():
return False return False
if not self.h265enabled(): 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 return False
# Found with e.g. trailers # Found with e.g. trailers
@ -159,11 +155,11 @@ class PlayUtils():
videoCodec = self.API.getVideoCodec() videoCodec = self.API.getVideoCodec()
codec = videoCodec['videocodec'] codec = videoCodec['videocodec']
resolution = videoCodec['resolution'] resolution = videoCodec['resolution']
if ((utils.settings('transcodeH265') == "true") and if ((utils.settings('transcodeHEVC') == "true") and
("h265" in codec) and ("hevc" in codec) and
(resolution == "1080")): (resolution == "1080")):
# Avoid H265 1080p # Avoid HEVC(H265) 1080p
self.logMsg("Option to transcode 1080P/H265 enabled.", 0) self.logMsg("Option to transcode 1080P/HEVC enabled.", 0)
return False return False
else: else:
return True return True