diff --git a/ffpresets/libx264-baseline.avpreset b/ffpresets/libx264-baseline.avpreset
new file mode 100644
index 0000000000..0626e28440
--- /dev/null
+++ b/ffpresets/libx264-baseline.avpreset
@@ -0,0 +1 @@
+profile=baseline
diff --git a/ffpresets/libx264-baseline.ffpreset b/ffpresets/libx264-baseline.ffpreset
deleted file mode 100644
index ee7654bdec..0000000000
--- a/ffpresets/libx264-baseline.ffpreset
+++ /dev/null
@@ -1,4 +0,0 @@
-coder=0
-bf=0
-flags2=-wpred-dct8x8
-wpredp=0
diff --git a/ffpresets/libx264-fast.avpreset b/ffpresets/libx264-fast.avpreset
new file mode 100644
index 0000000000..a8c526e8b4
--- /dev/null
+++ b/ffpresets/libx264-fast.avpreset
@@ -0,0 +1 @@
+preset=fast
diff --git a/ffpresets/libx264-fast.ffpreset b/ffpresets/libx264-fast.ffpreset
deleted file mode 100644
index 65201331bd..0000000000
--- a/ffpresets/libx264-fast.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partb8x8
-me_method=hex
-subq=6
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=2
-directpred=1
-trellis=1
-flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
-wpredp=2
-rc_lookahead=30
diff --git a/ffpresets/libx264-fast_firstpass.avpreset b/ffpresets/libx264-fast_firstpass.avpreset
new file mode 100644
index 0000000000..d9cf5afe0e
--- /dev/null
+++ b/ffpresets/libx264-fast_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=fast
+fastfirstpass=1
diff --git a/ffpresets/libx264-fast_firstpass.ffpreset b/ffpresets/libx264-fast_firstpass.ffpreset
deleted file mode 100644
index 6fdb4b9e55..0000000000
--- a/ffpresets/libx264-fast_firstpass.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=2
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=1
-directpred=1
-trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
-wpredp=2
-rc_lookahead=30
diff --git a/ffpresets/libx264-faster.avpreset b/ffpresets/libx264-faster.avpreset
new file mode 100644
index 0000000000..e311989bbb
--- /dev/null
+++ b/ffpresets/libx264-faster.avpreset
@@ -0,0 +1 @@
+preset=faster
diff --git a/ffpresets/libx264-faster.ffpreset b/ffpresets/libx264-faster.ffpreset
deleted file mode 100644
index 52efc1a325..0000000000
--- a/ffpresets/libx264-faster.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partb8x8
-me_method=hex
-subq=4
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=2
-directpred=1
-trellis=1
-flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip
-wpredp=1
-rc_lookahead=20
diff --git a/ffpresets/libx264-faster_firstpass.avpreset b/ffpresets/libx264-faster_firstpass.avpreset
new file mode 100644
index 0000000000..48a2d443bc
--- /dev/null
+++ b/ffpresets/libx264-faster_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=faster
+fastfirstpass=1
diff --git a/ffpresets/libx264-faster_firstpass.ffpreset b/ffpresets/libx264-faster_firstpass.ffpreset
deleted file mode 100644
index 41a87fb6b3..0000000000
--- a/ffpresets/libx264-faster_firstpass.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=2
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=1
-directpred=1
-trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
-wpredp=1
-rc_lookahead=20
diff --git a/ffpresets/libx264-ipod320.avpreset b/ffpresets/libx264-ipod320.avpreset
new file mode 100644
index 0000000000..6323191740
--- /dev/null
+++ b/ffpresets/libx264-ipod320.avpreset
@@ -0,0 +1,4 @@
+profile=baseline
+level=13
+maxrate=768000
+bufsize=3000000
diff --git a/ffpresets/libx264-ipod320.ffpreset b/ffpresets/libx264-ipod320.ffpreset
deleted file mode 100644
index 943b521348..0000000000
--- a/ffpresets/libx264-ipod320.ffpreset
+++ /dev/null
@@ -1,7 +0,0 @@
-coder=0
-bf=0
-flags2=-wpred-dct8x8
-level=13
-maxrate=768000
-bufsize=3000000
-wpredp=0
diff --git a/ffpresets/libx264-ipod640.avpreset b/ffpresets/libx264-ipod640.avpreset
new file mode 100644
index 0000000000..c2c3e1a88e
--- /dev/null
+++ b/ffpresets/libx264-ipod640.avpreset
@@ -0,0 +1,4 @@
+profile=baseline
+level=30
+maxrate=10000000
+bufsize=10000000
diff --git a/ffpresets/libx264-ipod640.ffpreset b/ffpresets/libx264-ipod640.ffpreset
deleted file mode 100644
index 1ed3d9fb28..0000000000
--- a/ffpresets/libx264-ipod640.ffpreset
+++ /dev/null
@@ -1,8 +0,0 @@
-coder=0
-bf=0
-refs=1
-flags2=-wpred-dct8x8
-level=30
-maxrate=10000000
-bufsize=10000000
-wpredp=0
diff --git a/ffpresets/libx264-lossless_fast.avpreset b/ffpresets/libx264-lossless_fast.avpreset
new file mode 100644
index 0000000000..1658d563aa
--- /dev/null
+++ b/ffpresets/libx264-lossless_fast.avpreset
@@ -0,0 +1,2 @@
+preset=fast
+qp=0
diff --git a/ffpresets/libx264-lossless_fast.ffpreset b/ffpresets/libx264-lossless_fast.ffpreset
deleted file mode 100644
index 49b9ed1add..0000000000
--- a/ffpresets/libx264-lossless_fast.ffpreset
+++ /dev/null
@@ -1,20 +0,0 @@
-coder=0
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8+parti4x4+partp8x8-partp4x4-partb8x8
-me_method=hex
-subq=3
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-directpred=1
-flags2=+fastpskip
-cqp=0
-wpredp=0
diff --git a/ffpresets/libx264-lossless_max.avpreset b/ffpresets/libx264-lossless_max.avpreset
new file mode 100644
index 0000000000..c25ff32d16
--- /dev/null
+++ b/ffpresets/libx264-lossless_max.avpreset
@@ -0,0 +1,2 @@
+preset=placebo
+qp=0
diff --git a/ffpresets/libx264-lossless_max.ffpreset b/ffpresets/libx264-lossless_max.ffpreset
deleted file mode 100644
index f32d7b40c6..0000000000
--- a/ffpresets/libx264-lossless_max.ffpreset
+++ /dev/null
@@ -1,21 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partp4x4-partb8x8
-me_method=esa
-subq=8
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-refs=16
-directpred=1
-flags2=+mixed_refs+dct8x8+fastpskip
-cqp=0
-wpredp=2
diff --git a/ffpresets/libx264-lossless_medium.avpreset b/ffpresets/libx264-lossless_medium.avpreset
new file mode 100644
index 0000000000..f7b1d81f39
--- /dev/null
+++ b/ffpresets/libx264-lossless_medium.avpreset
@@ -0,0 +1,2 @@
+preset=medium
+qp=0
diff --git a/ffpresets/libx264-lossless_medium.ffpreset b/ffpresets/libx264-lossless_medium.ffpreset
deleted file mode 100644
index 0b84612fcb..0000000000
--- a/ffpresets/libx264-lossless_medium.ffpreset
+++ /dev/null
@@ -1,20 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8+parti4x4+partp8x8+partp4x4-partb8x8
-me_method=hex
-subq=5
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-directpred=1
-flags2=+fastpskip
-cqp=0
-wpredp=2
diff --git a/ffpresets/libx264-lossless_slow.avpreset b/ffpresets/libx264-lossless_slow.avpreset
new file mode 100644
index 0000000000..a15ff4c426
--- /dev/null
+++ b/ffpresets/libx264-lossless_slow.avpreset
@@ -0,0 +1,2 @@
+preset=slow
+qp=0
diff --git a/ffpresets/libx264-lossless_slow.ffpreset b/ffpresets/libx264-lossless_slow.ffpreset
deleted file mode 100644
index 857d3d1986..0000000000
--- a/ffpresets/libx264-lossless_slow.ffpreset
+++ /dev/null
@@ -1,21 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partp4x4-partb8x8
-me_method=umh
-subq=6
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-refs=2
-directpred=1
-flags2=+dct8x8+fastpskip
-cqp=0
-wpredp=2
diff --git a/ffpresets/libx264-lossless_slower.avpreset b/ffpresets/libx264-lossless_slower.avpreset
new file mode 100644
index 0000000000..bd71f03291
--- /dev/null
+++ b/ffpresets/libx264-lossless_slower.avpreset
@@ -0,0 +1,2 @@
+preset=slower
+qp=0
diff --git a/ffpresets/libx264-lossless_slower.ffpreset b/ffpresets/libx264-lossless_slower.ffpreset
deleted file mode 100644
index ef0609f1b6..0000000000
--- a/ffpresets/libx264-lossless_slower.ffpreset
+++ /dev/null
@@ -1,21 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partp4x4-partb8x8
-me_method=umh
-subq=8
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-refs=4
-directpred=1
-flags2=+mixed_refs+dct8x8+fastpskip
-cqp=0
-wpredp=2
diff --git a/ffpresets/libx264-lossless_ultrafast.avpreset b/ffpresets/libx264-lossless_ultrafast.avpreset
new file mode 100644
index 0000000000..4d71eb72aa
--- /dev/null
+++ b/ffpresets/libx264-lossless_ultrafast.avpreset
@@ -0,0 +1,2 @@
+preset=ultrafast
+qp=0
diff --git a/ffpresets/libx264-lossless_ultrafast.ffpreset b/ffpresets/libx264-lossless_ultrafast.ffpreset
deleted file mode 100644
index 4cc84f1b4f..0000000000
--- a/ffpresets/libx264-lossless_ultrafast.ffpreset
+++ /dev/null
@@ -1,19 +0,0 @@
-coder=0
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8
-me_method=dia
-subq=0
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-directpred=1
-flags2=+fastpskip
-cqp=0
diff --git a/ffpresets/libx264-main.avpreset b/ffpresets/libx264-main.avpreset
new file mode 100644
index 0000000000..336c69b3af
--- /dev/null
+++ b/ffpresets/libx264-main.avpreset
@@ -0,0 +1 @@
+profile=main
diff --git a/ffpresets/libx264-main.ffpreset b/ffpresets/libx264-main.ffpreset
deleted file mode 100644
index d1dc7ddae9..0000000000
--- a/ffpresets/libx264-main.ffpreset
+++ /dev/null
@@ -1 +0,0 @@
-flags2=-dct8x8
diff --git a/ffpresets/libx264-medium.avpreset b/ffpresets/libx264-medium.avpreset
new file mode 100644
index 0000000000..261d584f95
--- /dev/null
+++ b/ffpresets/libx264-medium.avpreset
@@ -0,0 +1 @@
+preset=medium
diff --git a/ffpresets/libx264-medium.ffpreset b/ffpresets/libx264-medium.ffpreset
deleted file mode 100644
index 685995226d..0000000000
--- a/ffpresets/libx264-medium.ffpreset
+++ /dev/null
@@ -1,22 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partb8x8
-me_method=hex
-subq=7
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=3
-directpred=1
-trellis=1
-flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
-wpredp=2
diff --git a/ffpresets/libx264-medium_firstpass.avpreset b/ffpresets/libx264-medium_firstpass.avpreset
new file mode 100644
index 0000000000..06c8f9f8fb
--- /dev/null
+++ b/ffpresets/libx264-medium_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=medium
+fastfirstpass=1
diff --git a/ffpresets/libx264-medium_firstpass.ffpreset b/ffpresets/libx264-medium_firstpass.ffpreset
deleted file mode 100644
index ca304ee24d..0000000000
--- a/ffpresets/libx264-medium_firstpass.ffpreset
+++ /dev/null
@@ -1,22 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=2
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=1
-directpred=1
-trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
-wpredp=2
diff --git a/ffpresets/libx264-placebo.avpreset b/ffpresets/libx264-placebo.avpreset
new file mode 100644
index 0000000000..93d721d004
--- /dev/null
+++ b/ffpresets/libx264-placebo.avpreset
@@ -0,0 +1 @@
+preset=placebo
diff --git a/ffpresets/libx264-placebo.ffpreset b/ffpresets/libx264-placebo.ffpreset
deleted file mode 100644
index 7923a76c74..0000000000
--- a/ffpresets/libx264-placebo.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8
-me_method=tesa
-subq=10
-me_range=24
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=2
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=16
-refs=16
-directpred=3
-trellis=2
-flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip
-wpredp=2
-rc_lookahead=60
diff --git a/ffpresets/libx264-placebo_firstpass.avpreset b/ffpresets/libx264-placebo_firstpass.avpreset
new file mode 100644
index 0000000000..c8099e50c7
--- /dev/null
+++ b/ffpresets/libx264-placebo_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=placebo
+fastfirstpass=1
diff --git a/ffpresets/libx264-placebo_firstpass.ffpreset b/ffpresets/libx264-placebo_firstpass.ffpreset
deleted file mode 100644
index 7923a76c74..0000000000
--- a/ffpresets/libx264-placebo_firstpass.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8
-me_method=tesa
-subq=10
-me_range=24
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=2
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=16
-refs=16
-directpred=3
-trellis=2
-flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip
-wpredp=2
-rc_lookahead=60
diff --git a/ffpresets/libx264-slow.avpreset b/ffpresets/libx264-slow.avpreset
new file mode 100644
index 0000000000..85778ec8ba
--- /dev/null
+++ b/ffpresets/libx264-slow.avpreset
@@ -0,0 +1 @@
+preset=slow
diff --git a/ffpresets/libx264-slow.ffpreset b/ffpresets/libx264-slow.ffpreset
deleted file mode 100644
index fcbef4bcfc..0000000000
--- a/ffpresets/libx264-slow.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partb8x8
-me_method=umh
-subq=8
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=2
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=5
-directpred=3
-trellis=1
-flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
-wpredp=2
-rc_lookahead=50
diff --git a/ffpresets/libx264-slow_firstpass.avpreset b/ffpresets/libx264-slow_firstpass.avpreset
new file mode 100644
index 0000000000..9998bc95a2
--- /dev/null
+++ b/ffpresets/libx264-slow_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=slow
+fastfirstpass=1
diff --git a/ffpresets/libx264-slow_firstpass.ffpreset b/ffpresets/libx264-slow_firstpass.ffpreset
deleted file mode 100644
index 74f87b0c2d..0000000000
--- a/ffpresets/libx264-slow_firstpass.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=2
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=2
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=1
-directpred=3
-trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
-wpredp=2
-rc_lookahead=50
diff --git a/ffpresets/libx264-slower.avpreset b/ffpresets/libx264-slower.avpreset
new file mode 100644
index 0000000000..87d69893f2
--- /dev/null
+++ b/ffpresets/libx264-slower.avpreset
@@ -0,0 +1 @@
+preset=slower
diff --git a/ffpresets/libx264-slower.ffpreset b/ffpresets/libx264-slower.ffpreset
deleted file mode 100644
index 741d21f920..0000000000
--- a/ffpresets/libx264-slower.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8
-me_method=umh
-subq=9
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=2
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=8
-directpred=3
-trellis=2
-flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
-wpredp=2
-rc_lookahead=60
diff --git a/ffpresets/libx264-slower_firstpass.avpreset b/ffpresets/libx264-slower_firstpass.avpreset
new file mode 100644
index 0000000000..c798b82872
--- /dev/null
+++ b/ffpresets/libx264-slower_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=slower
+fastfirstpass=1
diff --git a/ffpresets/libx264-slower_firstpass.ffpreset b/ffpresets/libx264-slower_firstpass.ffpreset
deleted file mode 100644
index 0be886a156..0000000000
--- a/ffpresets/libx264-slower_firstpass.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=2
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=2
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=1
-directpred=3
-trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
-wpredp=2
-rc_lookahead=60
diff --git a/ffpresets/libx264-superfast.avpreset b/ffpresets/libx264-superfast.avpreset
new file mode 100644
index 0000000000..1c117ecf60
--- /dev/null
+++ b/ffpresets/libx264-superfast.avpreset
@@ -0,0 +1 @@
+preset=superfast
diff --git a/ffpresets/libx264-superfast.ffpreset b/ffpresets/libx264-superfast.ffpreset
deleted file mode 100644
index 7f0f50b782..0000000000
--- a/ffpresets/libx264-superfast.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=1
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=1
-directpred=1
-trellis=0
-flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip-mbtree
-wpredp=0
-rc_lookahead=0
diff --git a/ffpresets/libx264-superfast_firstpass.avpreset b/ffpresets/libx264-superfast_firstpass.avpreset
new file mode 100644
index 0000000000..fc70e0970b
--- /dev/null
+++ b/ffpresets/libx264-superfast_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=superfast
+fastfirstpass=1
diff --git a/ffpresets/libx264-superfast_firstpass.ffpreset b/ffpresets/libx264-superfast_firstpass.ffpreset
deleted file mode 100644
index 87b4f29012..0000000000
--- a/ffpresets/libx264-superfast_firstpass.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=1
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=1
-directpred=1
-trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip-mbtree
-wpredp=0
-rc_lookahead=0
diff --git a/ffpresets/libx264-ultrafast.avpreset b/ffpresets/libx264-ultrafast.avpreset
new file mode 100644
index 0000000000..910330188f
--- /dev/null
+++ b/ffpresets/libx264-ultrafast.avpreset
@@ -0,0 +1 @@
+preset=ultrafast
diff --git a/ffpresets/libx264-ultrafast.ffpreset b/ffpresets/libx264-ultrafast.ffpreset
deleted file mode 100644
index 561191e399..0000000000
--- a/ffpresets/libx264-ultrafast.ffpreset
+++ /dev/null
@@ -1,24 +0,0 @@
-coder=0
-flags=-loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=0
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=0
-i_qfactor=0.71
-b_strategy=0
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=0
-refs=1
-directpred=1
-trellis=0
-flags2=-bpyramid-mixed_refs-wpred-dct8x8+fastpskip-mbtree
-wpredp=0
-aq_mode=0
-rc_lookahead=0
diff --git a/ffpresets/libx264-ultrafast_firstpass.avpreset b/ffpresets/libx264-ultrafast_firstpass.avpreset
new file mode 100644
index 0000000000..e3aaa17a2e
--- /dev/null
+++ b/ffpresets/libx264-ultrafast_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=ultrafast
+fastfirstpass=1
diff --git a/ffpresets/libx264-ultrafast_firstpass.ffpreset b/ffpresets/libx264-ultrafast_firstpass.ffpreset
deleted file mode 100644
index 561191e399..0000000000
--- a/ffpresets/libx264-ultrafast_firstpass.ffpreset
+++ /dev/null
@@ -1,24 +0,0 @@
-coder=0
-flags=-loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=0
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=0
-i_qfactor=0.71
-b_strategy=0
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=0
-refs=1
-directpred=1
-trellis=0
-flags2=-bpyramid-mixed_refs-wpred-dct8x8+fastpskip-mbtree
-wpredp=0
-aq_mode=0
-rc_lookahead=0
diff --git a/ffpresets/libx264-veryfast.avpreset b/ffpresets/libx264-veryfast.avpreset
new file mode 100644
index 0000000000..fa49629b35
--- /dev/null
+++ b/ffpresets/libx264-veryfast.avpreset
@@ -0,0 +1 @@
+preset=veryfast
diff --git a/ffpresets/libx264-veryfast.ffpreset b/ffpresets/libx264-veryfast.ffpreset
deleted file mode 100644
index d8c7f7a371..0000000000
--- a/ffpresets/libx264-veryfast.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partb8x8
-me_method=hex
-subq=2
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=1
-directpred=1
-trellis=0
-flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip
-wpredp=0
-rc_lookahead=10
diff --git a/ffpresets/libx264-veryfast_firstpass.avpreset b/ffpresets/libx264-veryfast_firstpass.avpreset
new file mode 100644
index 0000000000..4909030551
--- /dev/null
+++ b/ffpresets/libx264-veryfast_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=veryfast
+fastfirstpass=1
diff --git a/ffpresets/libx264-veryfast_firstpass.ffpreset b/ffpresets/libx264-veryfast_firstpass.ffpreset
deleted file mode 100644
index 7b2a1e93d2..0000000000
--- a/ffpresets/libx264-veryfast_firstpass.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=2
-me_range=16
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=1
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=3
-refs=1
-directpred=1
-trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
-wpredp=0
-rc_lookahead=10
diff --git a/ffpresets/libx264-veryslow.avpreset b/ffpresets/libx264-veryslow.avpreset
new file mode 100644
index 0000000000..7e01c8f5c1
--- /dev/null
+++ b/ffpresets/libx264-veryslow.avpreset
@@ -0,0 +1 @@
+preset=veryslow
diff --git a/ffpresets/libx264-veryslow.ffpreset b/ffpresets/libx264-veryslow.ffpreset
deleted file mode 100644
index 82333655f9..0000000000
--- a/ffpresets/libx264-veryslow.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8
-me_method=umh
-subq=10
-me_range=24
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=2
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=8
-refs=16
-directpred=3
-trellis=2
-flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip
-wpredp=2
-rc_lookahead=60
diff --git a/ffpresets/libx264-veryslow_firstpass.avpreset b/ffpresets/libx264-veryslow_firstpass.avpreset
new file mode 100644
index 0000000000..daf5a8f4d5
--- /dev/null
+++ b/ffpresets/libx264-veryslow_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=veryslow
+fastfirstpass=1
diff --git a/ffpresets/libx264-veryslow_firstpass.ffpreset b/ffpresets/libx264-veryslow_firstpass.ffpreset
deleted file mode 100644
index 2bbf4731f4..0000000000
--- a/ffpresets/libx264-veryslow_firstpass.ffpreset
+++ /dev/null
@@ -1,23 +0,0 @@
-coder=1
-flags=+loop+cgop
-cmp=+chroma
-partitions=-parti8x8-parti4x4-partp8x8-partb8x8
-me_method=dia
-subq=2
-me_range=24
-g=250
-keyint_min=25
-sc_threshold=40
-i_qfactor=0.71
-b_strategy=2
-qcomp=0.6
-qmin=0
-qmax=69
-qdiff=4
-bf=8
-refs=1
-directpred=3
-trellis=0
-flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip
-wpredp=2
-rc_lookahead=60