github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-07-14 17:22:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

resolve conflict

Browse source
This commit is contained in:
clinton-hall 2013-05-26 22:53:29 +09:30
parent c7947952c4
commit c7cb0453da
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
autoProcess/Transcoder.py
View file

@ -68,16 +68,12 @@ def Transcode_directory(dirName):
if ext == outputVideoExtension: # we need to change the name to prevent overwriting itself. if ext == outputVideoExtension: # we need to change the name to prevent overwriting itself.
outputVideoExtension = '-transcoded' + outputVideoExtension # adds '-transcoded.ext' outputVideoExtension = '-transcoded' + outputVideoExtension # adds '-transcoded.ext'
newfilePath = os.path.normpath(name + outputVideoExtension) newfilePath = os.path.normpath(name + outputVideoExtension)
<<<<<<< HEAD
command = [ffmpeg, '-loglevel', 'warning', '-i', filePath, '-map', '0'] command = [ffmpeg, '-loglevel', 'warning', '-i', filePath, '-map', '0']
=======
command = [ffmpeg, '-i', filePath, '-map', '0']
if useNiceness: if useNiceness:
command = ['nice', '-%d' % niceness] + command command = ['nice', '-%d' % niceness] + command
>>>>>>> master
if len(outputVideoCodec) > 0: if len(outputVideoCodec) > 0:
command.append('-c:v') command.append('-c:v')
command.append(outputVideoCodec) command.append(outputVideoCodec)