From 31b2632ed33dc21ca1916fa93205f0ef4c4fa5fa Mon Sep 17 00:00:00 2001
From: KRKeegan <-NOSPAM-kevin@krkeegan.com>
Date: Sun, 4 May 2008 13:46:26 -0700
Subject: [PATCH] Fix in select_videofps a merge conflict error.

---
 plugins/video/transcode.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/video/transcode.py b/plugins/video/transcode.py
index 08e3057..ebd358c 100644
--- a/plugins/video/transcode.py
+++ b/plugins/video/transcode.py
@@ -101,7 +101,7 @@ def select_audioch(tsn):
     return ''
 
 def select_videofps(inFile, tsn):
-    type, width, height, fps, millisecs, kbps, akbps, acodec, afreq, vpar =  video_info(inFile)
+    type, width, height, fps, millisecs, kbps, akbps, acodec, afreq, par1, par2, dar1, dar2 =  video_info(inFile)
     vfps = '-r 29.97'  #default
     if config.isHDtivo(tsn) and fps not in BAD_MPEG_FPS:
         vfps = ' '
-- 
2.11.4.GIT