diff --git a/core/__init__.py b/core/__init__.py index 70995348..21a1108e 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -658,7 +658,7 @@ def initialize(section=None): 'SCODEC':'mov_text' }, 'MKV-SD':{ - 'VEXTENSION':'.mkv','VCODEC':'libx264','VPRESET':None,'VFRAMERATE':None,'VBITRATE':None,'VCRF':None,'VLEVEL':None, + 'VEXTENSION':'.mkv','VCODEC':'libx264','VPRESET':None,'VFRAMERATE':None,'VBITRATE':'1200k','VCRF':None,'VLEVEL':None, 'VRESOLUTION':'720:-1','VCODEC_ALLOW':['libx264', 'h264', 'h.264', 'AVC', 'avc', 'mpeg4', 'msmpeg4', 'MPEG-4'], 'ACODEC':'aac','ACODEC_ALLOW':['libfaac'],'ABITRATE':128000, 'ACHANNELS':2, 'ACODEC2':'ac3','ACODEC2_ALLOW':['ac3'],'ABITRATE2':None, 'ACHANNELS2':6, diff --git a/core/nzbToMediaConfig.py b/core/nzbToMediaConfig.py index b40b1cf8..1db3d987 100644 --- a/core/nzbToMediaConfig.py +++ b/core/nzbToMediaConfig.py @@ -418,7 +418,7 @@ class ConfigObj(configobj.ConfigObj, Section): 'OUTPUTAUDIOTRACK2CODEC', 'AUDIOCODEC2ALLOW', 'OUTPUTAUDIOTRACK2BITRATE', 'OUTPUTAUDIOOTHERCODEC', 'AUDIOOTHERCODECALLOW', 'OUTPUTAUDIOOTHERBITRATE', 'OUTPUTSUBTITLECODEC', 'OUTPUTAUDIOCHANNELS', 'OUTPUTAUDIOTRACK2CHANNELS', - 'OUTPUTAUDIOOTHERCHANNELS'] + 'OUTPUTAUDIOOTHERCHANNELS','OUTPUTVIDEORESOLUTION'] cfgKeys = ['transcode', 'duplicate', 'ignoreExtensions', 'outputFastStart', 'outputVideoPath', 'processOutput', 'audioLanguage', 'allAudioLanguages', 'subLanguages', 'allSubLanguages', 'embedSubs', 'burnInSubtitle', 'extractSubs', 'externalSubDir', @@ -428,7 +428,7 @@ class ConfigObj(configobj.ConfigObj, Section): 'outputAudioTrack2Codec', 'AudioCodec2Allow', 'outputAudioTrack2Bitrate', 'outputAudioOtherCodec', 'AudioOtherCodecAllow', 'outputAudioOtherBitrate', 'outputSubtitleCodec', 'outputAudioChannels', 'outputAudioTrack2Channels', - 'outputAudioOtherChannels'] + 'outputAudioOtherChannels', 'outputVideoResolution'] for index in range(len(envKeys)): key = 'NZBPO_{index}'.format(index=envKeys[index]) if key in os.environ: diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py index 24d278f8..3df7f420 100755 --- a/nzbToCouchPotato.py +++ b/nzbToCouchPotato.py @@ -207,6 +207,7 @@ #outputVideoExtension=.mp4 #outputVideoCodec=libx264 #VideoCodecAllow= +#outputVideoResolution=720:-1 #outputVideoPreset=medium #outputVideoFramerate=24 #outputVideoBitrate=800k diff --git a/nzbToMedia.py b/nzbToMedia.py index 15bb03bc..80f8c48a 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -418,6 +418,7 @@ #outputVideoExtension=.mp4 #outputVideoCodec=libx264 #VideoCodecAllow= +#outputVideoResolution=720:-1 #outputVideoPreset=medium #outputVideoFramerate=24 #outputVideoBitrate=800k diff --git a/nzbToNzbDrone.py b/nzbToNzbDrone.py index 74cb4702..4cd1f860 100755 --- a/nzbToNzbDrone.py +++ b/nzbToNzbDrone.py @@ -197,6 +197,7 @@ #outputVideoExtension=.mp4 #outputVideoCodec=libx264 #VideoCodecAllow = +#outputVideoResolution=720:-1 #outputVideoPreset=medium #outputVideoFramerate=24 #outputVideoBitrate=800k diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py index 5f4d3de6..1bff8fc7 100755 --- a/nzbToSickBeard.py +++ b/nzbToSickBeard.py @@ -210,6 +210,7 @@ #outputVideoExtension=.mp4 #outputVideoCodec=libx264 #VideoCodecAllow= +#outputVideoResolution=720:-1 #outputVideoPreset=medium #outputVideoFramerate=24 #outputVideoBitrate=800k