From a469554594759c7833630b81b312efa5f4c0924a Mon Sep 17 00:00:00 2001
From: TheAMM <the.actual.amm@gmail.com>
Date: Thu, 3 May 2018 00:44:01 +0300
Subject: encode: remove removed encode options from presets

---
 etc/encoding-profiles.conf | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'etc')

diff --git a/etc/encoding-profiles.conf b/etc/encoding-profiles.conf
index 5f09faa6c8..77a0d91b8f 100644
--- a/etc/encoding-profiles.conf
+++ b/etc/encoding-profiles.conf
@@ -31,7 +31,7 @@
 #
 # Examples:
 #   mpv --profile=enc-to-dvdpal --o=outfile.mpg infile.mkv
-#   mpv --profile=enc-f-avi --ofps=30 --o=outfile.avi infile.mkv
+#   mpv --profile=enc-f-avi --vf=fps=30 --o=outfile.avi infile.mkv
 #   mpv --profile=enc-v-mpeg4 --ovcopts-add=qscale=7 --profile=enc-a-mp3 --oacopts-add=b=320k --o=outfile.avi infile.mkv
 
 ################
@@ -105,7 +105,6 @@ ovcopts = speed=6,lag-in-frames=8,slices=2,threads=0,crf=18,qmin=0,qmax=36
 [enc-f-3gp]
 profile-desc = "H.263 + AAC (for 3GP)"
 of = 3gp
-ocopyts = yes
 profile = enc-v-h263
 profile = enc-a-aac
 ofopts = ""
@@ -113,8 +112,6 @@ ofopts = ""
 [enc-f-avi]
 profile-desc = "MPEG-4 + MP3 (for AVI)"
 of = avi
-ocopyts = no
-oautofps = yes
 profile = enc-v-mpeg4
 profile = enc-a-mp3
 ofopts = ""
@@ -122,7 +119,6 @@ ofopts = ""
 [enc-f-mp4]
 profile-desc = "H.264 + AAC (for MP4)"
 of = mp4
-ocopyts = yes
 profile = enc-v-h264
 profile = enc-a-aac
 ## equivalent to using qt-faststart tool
@@ -132,7 +128,6 @@ profile = enc-a-aac
 [enc-f-webm]
 profile-desc = "VP9 + Opus (for WebM)"
 of = webm
-ocopyts = yes
 profile = enc-v-vp9
 profile = enc-a-opus
 ofopts = ""
@@ -147,8 +142,7 @@ profile = enc-a-ac3
 of = dvd
 ofopts-append = packetsize=2048
 ofopts-append = muxrate=10080000
-ofps = 25
-oharddup = yes
+vf-add = fps=25
 audio-samplerate = 48000
 ovcopts = g=15,b=6000000,maxrate=9000000,minrate=0,bufsize=1835008
 
@@ -159,8 +153,7 @@ profile = enc-a-ac3
 of = dvd
 ofopts-append = packetsize=2048
 ofopts-append = muxrate=10080000
-ofps = 24000/1001
-oharddup = yes
+vf-add = fps="24000/1001"
 audio-samplerate = 48000
 ovcopts = g=18,b=6000000,maxrate=9000000,minrate=0,bufsize=1835008
 
@@ -175,12 +168,11 @@ ovcopts-append = maxrate=10000k
 ovcopts-append = bufsize=10000k
 ovcopts-append = rc_init_occupancy=9000k
 ovcopts-append = refs=5
-omaxfps = 30
 
 [enc-to-nok-6300]
 profile-desc = "3GP for Nokia 6300"
 profile = enc-f-3gp
-ofps = 25
+vf-add = fps=25
 vf-add = lavfi=graph="scale=176:144"
 audio-samplerate = 16000
 audio-channels = 1
@@ -189,7 +181,6 @@ oacopts-add = b=32k
 [enc-to-hp-slate-7]
 profile-desc = "MP4 for HP Slate 7 (1024x600, crazy aspect)"
 profile = enc-f-mp4
-omaxfps = 30
 ovcopts-add = profile=high
 # DW = 1024, DH = 600, DAR = 97:54 (=> SAR = 2425:2304)
 vf-add = lavfi=graph="scale=floor(min(1024*min(1\,dar/(97/54))\,in_w)/2+0.5)*2:floor(min(600*min((97/54)/dar\,1)\,in_h)/2+0.5)*2,setsar=sar=sar/(2425/2304)"
-- 
cgit v1.2.3