Skip to content
Browse files

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

  • Loading branch information...
1 parent b8ac09b commit 0bbe6fd1ac7b65d2225ee289d0cf82d3eadd8a22 @wmcbrine committed
Showing with 4 additions and 4 deletions.
  1. +1 −1 config.py
  2. +1 −1 plugins/admin/help.txt
  3. +2 −2 pyTivo.conf.dist
View
2 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'
View
2 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
View
4 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

0 comments on commit 0bbe6fd

Please sign in to comment.
Something went wrong with that request. Please try again.