Excidental Push. Sorry!

Revert "Support VLC since version 0.9"

This reverts commit 520de78a4405c4f052aae367d39d80045862f322.

diff --git a/vlcplayer/src/VlcServer.py b/vlcplayer/src/VlcServer.py
index 147f547..d41b15f 100644 (file)
--- a/vlcplayer/src/VlcServer.py
+++ b/vlcplayer/src/VlcServer.py
@@ -211,24 +211,12 @@ class VlcServer:
 
                if not doDirect or self.getTranscodeVideo():
                        videoNormList = self.getVideoNorm().split(",")
-                       # ,height=%s
-                       # Video settings\r
-                       transcode.append("vcodec=%s,vb=%d,venc=ffmpeg{strict-rc=1},fps=%s" % (\r
+#                      ,height=%s
+                       transcode.append("vcodec=%s,vb=%d,venc=ffmpeg{strict-rc=1},width=%s,height=%s,canvas-width=%s,canvas-height=%s,canvas-aspect=%s,fps=%s" % (
                                self.getVideoCodec(),self.getVideoBitrate(),
-                                videoNormList[3]\r
-                       ))\r
-                       # Old canvas settings\r
-                       #transcode.append("width=%s,height=%s,canvas-width=%s,canvas-height=%s,canvas-aspect=%s" % (             \r
-                       #       str(int(float(videoNormList[0]) - float(videoNormList[0]) * float(self.getOverscanCorrection()) / 100)),\r
-                       #       str(int(float(videoNormList[1]) - float(videoNormList[1]) * float(self.getOverscanCorrection()) / 100)),\r
-                       #       videoNormList[0], videoNormList[1], videoNormList[2],\r
-                       #))\r
-                       \r
-                       #New canvas - since VLC 0.9\r
-                       transcode.append("vfilter=canvas{width=%s,height=%s,aspect=%s}" % (              \r
                                str(int(float(videoNormList[0]) - float(videoNormList[0]) * float(self.getOverscanCorrection()) / 100)),
                                str(int(float(videoNormList[1]) - float(videoNormList[1]) * float(self.getOverscanCorrection()) / 100)),
-                               videoNormList[2]\r
+                               videoNormList[0], videoNormList[1], videoNormList[2], videoNormList[3]
                        ))
                        if self.getSOverlay():
                                transcode.append("soverlay")