From c7cb0453da7da55e4818ee65549628c5414a280b Mon Sep 17 00:00:00 2001
From: clinton-hall <fock_wulf@hotmail.com>
Date: Sun, 26 May 2013 22:53:29 +0930
Subject: [PATCH] resolve conflict

---
 autoProcess/Transcoder.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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