Remove the ffmpeg comment (incompatible with recent versions of ffmpeg).

wmcbrine · Mar 5, 2009 · 0bbe6fd · 0bbe6fd
1 parent b8ac09b
commit 0bbe6fd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/config.py b/config.py
@@ -149,7 +149,7 @@ def getFFmpegTemplate(tsn):
     if tmpl:
         return tmpl
     return '%(video_codec)s %(video_fps)s %(video_br)s %(max_video_br)s \
-            %(buff_size)s %(aspect_ratio)s -comment pyTivo.py %(audio_br)s \
+            %(buff_size)s %(aspect_ratio)s %(audio_br)s \
             %(audio_fr)s %(audio_ch)s %(audio_codec)s %(audio_lang)s \
             %(ffmpeg_pram)s %(format)s'
 

diff --git a/plugins/admin/help.txt b/plugins/admin/help.txt
@@ -430,7 +430,7 @@ Available In: Server, Tivos, HD_tivos, SD_tivos
 ffmpeg_tmpl
 
 Default Setting: %(video_codec)s %(video_fps)s %(video_br)s +\
-%(max_video_br)s %(buff_size)s %(aspect_ratio)s -comment pyTivo.py +\
+%(max_video_br)s %(buff_size)s %(aspect_ratio)s +\
 %(audio_br)s %(audio_fr)s %(audio_ch)s %(audio_codec)s %(audio_lang)s +\
 %(ffmpeg_pram)s %(format)s
 Valid Entries: A valid ffmpeg command

diff --git a/pyTivo.conf.dist b/pyTivo.conf.dist
@@ -48,7 +48,7 @@ ffmpeg=/usr/bin/ffmpeg
 # Valid heights: [S3/HD = 1080, 720], [S2/S3/HD = 480]
 #width=1280
 #height=720
-#ffmpeg_tmpl=%(video_codec)s %(video_fps)s %(video_br)s %(max_video_br)s %(buff_size)s %(aspect_ratio)s -comment pyTivo.py %(audio_br)s %(audio_fr)s %(audio_ch)s %(audio_codec)s %(ffmpeg_pram)s %(format)s
+#ffmpeg_tmpl=%(video_codec)s %(video_fps)s %(video_br)s %(max_video_br)s %(buff_size)s %(aspect_ratio)s %(audio_br)s %(audio_fr)s %(audio_ch)s %(audio_codec)s %(ffmpeg_pram)s %(format)s
 
 # Per tivo options
 # section named _tivo_TSN with the tsn in all caps
@@ -61,7 +61,7 @@ ffmpeg=/usr/bin/ffmpeg
 #height=720
 #audio_br=320K
 #video_br=12Mi
-#ffmpeg_tmpl=%(video_codec)s %(video_fps)s %(video_br)s %(max_video_br)s %(buff_size)s %(aspect_ratio)s -comment pyTivo.py %(audio_br)s %(audio_fr)s %(audio_ch)s %(audio_codec)s %(ffmpeg_pram)s %(format)s
+#ffmpeg_tmpl=%(video_codec)s %(video_fps)s %(video_br)s %(max_video_br)s %(buff_size)s %(aspect_ratio)s %(audio_br)s %(audio_fr)s %(audio_ch)s %(audio_codec)s %(ffmpeg_pram)s %(format)s
 
 #[_tivo_HD]
 # section for default video options applicable to all HD TiVos