---
Makefile | 2 +-
doc/avconv.texi | 2 +-
doc/ffmpeg.texi | 2 +-
ffpresets/libvpx-1080p.avpreset | 17 -----------------
ffpresets/libvpx-1080p50_60.avpreset | 17 -----------------
ffpresets/libvpx-360p.avpreset | 16 ----------------
ffpresets/libvpx-720p.avpreset | 17 -----------------
ffpresets/libvpx-720p50_60.avpreset | 17 -----------------
ffpresets/libx264-baseline.avpreset | 1 -
ffpresets/libx264-fast.avpreset | 1 -
ffpresets/libx264-fast_firstpass.avpreset | 2 --
ffpresets/libx264-faster.avpreset | 1 -
ffpresets/libx264-faster_firstpass.avpreset | 2 --
ffpresets/libx264-ipod320.avpreset | 4 ----
ffpresets/libx264-ipod640.avpreset | 4 ----
ffpresets/libx264-lossless_fast.avpreset | 2 --
ffpresets/libx264-lossless_max.avpreset | 2 --
ffpresets/libx264-lossless_medium.avpreset | 2 --
ffpresets/libx264-lossless_slow.avpreset | 2 --
ffpresets/libx264-lossless_slower.avpreset | 2 --
ffpresets/libx264-lossless_ultrafast.avpreset | 2 --
ffpresets/libx264-main.avpreset | 1 -
ffpresets/libx264-medium.avpreset | 1 -
ffpresets/libx264-medium_firstpass.avpreset | 2 --
ffpresets/libx264-placebo.avpreset | 1 -
ffpresets/libx264-placebo_firstpass.avpreset | 2 --
ffpresets/libx264-slow.avpreset | 1 -
ffpresets/libx264-slow_firstpass.avpreset | 2 --
ffpresets/libx264-slower.avpreset | 1 -
ffpresets/libx264-slower_firstpass.avpreset | 2 --
ffpresets/libx264-superfast.avpreset | 1 -
ffpresets/libx264-superfast_firstpass.avpreset | 2 --
ffpresets/libx264-ultrafast.avpreset | 1 -
ffpresets/libx264-ultrafast_firstpass.avpreset | 2 --
ffpresets/libx264-veryfast.avpreset | 1 -
ffpresets/libx264-veryfast_firstpass.avpreset | 2 --
ffpresets/libx264-veryslow.avpreset | 1 -
ffpresets/libx264-veryslow_firstpass.avpreset | 2 --
presets/libvpx-1080p.avpreset | 17 +++++++++++++++++
presets/libvpx-1080p50_60.avpreset | 17 +++++++++++++++++
presets/libvpx-360p.avpreset | 16 ++++++++++++++++
presets/libvpx-720p.avpreset | 17 +++++++++++++++++
presets/libvpx-720p50_60.avpreset | 17 +++++++++++++++++
presets/libx264-baseline.avpreset | 1 +
presets/libx264-fast.avpreset | 1 +
presets/libx264-fast_firstpass.avpreset | 2 ++
presets/libx264-faster.avpreset | 1 +
presets/libx264-faster_firstpass.avpreset | 2 ++
presets/libx264-ipod320.avpreset | 4 ++++
presets/libx264-ipod640.avpreset | 4 ++++
presets/libx264-lossless_fast.avpreset | 2 ++
presets/libx264-lossless_max.avpreset | 2 ++
presets/libx264-lossless_medium.avpreset | 2 ++
presets/libx264-lossless_slow.avpreset | 2 ++
presets/libx264-lossless_slower.avpreset | 2 ++
presets/libx264-lossless_ultrafast.avpreset | 2 ++
presets/libx264-main.avpreset | 1 +
presets/libx264-medium.avpreset | 1 +
presets/libx264-medium_firstpass.avpreset | 2 ++
presets/libx264-placebo.avpreset | 1 +
presets/libx264-placebo_firstpass.avpreset | 2 ++
presets/libx264-slow.avpreset | 1 +
presets/libx264-slow_firstpass.avpreset | 2 ++
presets/libx264-slower.avpreset | 1 +
presets/libx264-slower_firstpass.avpreset | 2 ++
presets/libx264-superfast.avpreset | 1 +
presets/libx264-superfast_firstpass.avpreset | 2 ++
presets/libx264-ultrafast.avpreset | 1 +
presets/libx264-ultrafast_firstpass.avpreset | 2 ++
presets/libx264-veryfast.avpreset | 1 +
presets/libx264-veryfast_firstpass.avpreset | 2 ++
presets/libx264-veryslow.avpreset | 1 +
presets/libx264-veryslow_firstpass.avpreset | 2 ++
73 files changed, 139 insertions(+), 139 deletions(-)
delete mode 100644 ffpresets/libvpx-1080p.avpreset
delete mode 100644 ffpresets/libvpx-1080p50_60.avpreset
delete mode 100644 ffpresets/libvpx-360p.avpreset
delete mode 100644 ffpresets/libvpx-720p.avpreset
delete mode 100644 ffpresets/libvpx-720p50_60.avpreset
delete mode 100644 ffpresets/libx264-baseline.avpreset
delete mode 100644 ffpresets/libx264-fast.avpreset
delete mode 100644 ffpresets/libx264-fast_firstpass.avpreset
delete mode 100644 ffpresets/libx264-faster.avpreset
delete mode 100644 ffpresets/libx264-faster_firstpass.avpreset
delete mode 100644 ffpresets/libx264-ipod320.avpreset
delete mode 100644 ffpresets/libx264-ipod640.avpreset
delete mode 100644 ffpresets/libx264-lossless_fast.avpreset
delete mode 100644 ffpresets/libx264-lossless_max.avpreset
delete mode 100644 ffpresets/libx264-lossless_medium.avpreset
delete mode 100644 ffpresets/libx264-lossless_slow.avpreset
delete mode 100644 ffpresets/libx264-lossless_slower.avpreset
delete mode 100644 ffpresets/libx264-lossless_ultrafast.avpreset
delete mode 100644 ffpresets/libx264-main.avpreset
delete mode 100644 ffpresets/libx264-medium.avpreset
delete mode 100644 ffpresets/libx264-medium_firstpass.avpreset
delete mode 100644 ffpresets/libx264-placebo.avpreset
delete mode 100644 ffpresets/libx264-placebo_firstpass.avpreset
delete mode 100644 ffpresets/libx264-slow.avpreset
delete mode 100644 ffpresets/libx264-slow_firstpass.avpreset
delete mode 100644 ffpresets/libx264-slower.avpreset
delete mode 100644 ffpresets/libx264-slower_firstpass.avpreset
delete mode 100644 ffpresets/libx264-superfast.avpreset
delete mode 100644 ffpresets/libx264-superfast_firstpass.avpreset
delete mode 100644 ffpresets/libx264-ultrafast.avpreset
delete mode 100644 ffpresets/libx264-ultrafast_firstpass.avpreset
delete mode 100644 ffpresets/libx264-veryfast.avpreset
delete mode 100644 ffpresets/libx264-veryfast_firstpass.avpreset
delete mode 100644 ffpresets/libx264-veryslow.avpreset
delete mode 100644 ffpresets/libx264-veryslow_firstpass.avpreset
create mode 100644 presets/libvpx-1080p.avpreset
create mode 100644 presets/libvpx-1080p50_60.avpreset
create mode 100644 presets/libvpx-360p.avpreset
create mode 100644 presets/libvpx-720p.avpreset
create mode 100644 presets/libvpx-720p50_60.avpreset
create mode 100644 presets/libx264-baseline.avpreset
create mode 100644 presets/libx264-fast.avpreset
create mode 100644 presets/libx264-fast_firstpass.avpreset
create mode 100644 presets/libx264-faster.avpreset
create mode 100644 presets/libx264-faster_firstpass.avpreset
create mode 100644 presets/libx264-ipod320.avpreset
create mode 100644 presets/libx264-ipod640.avpreset
create mode 100644 presets/libx264-lossless_fast.avpreset
create mode 100644 presets/libx264-lossless_max.avpreset
create mode 100644 presets/libx264-lossless_medium.avpreset
create mode 100644 presets/libx264-lossless_slow.avpreset
create mode 100644 presets/libx264-lossless_slower.avpreset
create mode 100644 presets/libx264-lossless_ultrafast.avpreset
create mode 100644 presets/libx264-main.avpreset
create mode 100644 presets/libx264-medium.avpreset
create mode 100644 presets/libx264-medium_firstpass.avpreset
create mode 100644 presets/libx264-placebo.avpreset
create mode 100644 presets/libx264-placebo_firstpass.avpreset
create mode 100644 presets/libx264-slow.avpreset
create mode 100644 presets/libx264-slow_firstpass.avpreset
create mode 100644 presets/libx264-slower.avpreset
create mode 100644 presets/libx264-slower_firstpass.avpreset
create mode 100644 presets/libx264-superfast.avpreset
create mode 100644 presets/libx264-superfast_firstpass.avpreset
create mode 100644 presets/libx264-ultrafast.avpreset
create mode 100644 presets/libx264-ultrafast_firstpass.avpreset
create mode 100644 presets/libx264-veryfast.avpreset
create mode 100644 presets/libx264-veryfast_firstpass.avpreset
create mode 100644 presets/libx264-veryslow.avpreset
create mode 100644 presets/libx264-veryslow_firstpass.avpreset
diff --git a/Makefile b/Makefile
index feb57cb..04af278 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ FFLIBS-$(CONFIG_SWSCALE) += swscale
FFLIBS := avutil
-DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.avpreset)
+DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset)
SKIPHEADERS = cmdutils_common_opts.h
diff --git a/doc/avconv.texi b/doc/avconv.texi
index 6e38a47..c298dc5 100644
--- a/doc/avconv.texi
+++ b/doc/avconv.texi
@@ -778,7 +778,7 @@ A preset file contains a sequence of @var{option=value}
pairs, one for
each line, specifying a sequence of options which can be specified also on
the command line. Lines starting with the hash ('#') character are ignored and
are used to provide comments. Empty lines are also ignored. Check the
-@file{ffpresets} directory in the Libav source tree for examples.
+@file{presets} directory in the Libav source tree for examples.
Preset files are specified with the @code{pre} option, this option takes a
preset name as input. Avconv searches for a file named
@var{preset_name}.avpreset in
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 22989c0..968d4f6 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -791,7 +791,7 @@ A preset file contains a sequence of
@var{option}=@var{value} pairs,
one for each line, specifying a sequence of options which would be
awkward to specify on the command line. Lines starting with the hash
('#') character are ignored and are used to provide comments. Check
-the @file{ffpresets} directory in the Libav source tree for examples.
+the @file{presets} directory in the Libav source tree for examples.
Preset files are specified with the @code{vpre}, @code{apre},
@code{spre}, and @code{fpre} options. The @code{fpre} option takes the
diff --git a/ffpresets/libvpx-1080p.avpreset b/ffpresets/libvpx-1080p.avpreset
deleted file mode 100644
index 5c7da6f..0000000
--- a/ffpresets/libvpx-1080p.avpreset
+++ /dev/null
@@ -1,17 +0,0 @@
-g=120
-lag-in-frames=16
-deadline=good
-cpu-used=0
-profile=1
-qmax=51
-qmin=11
-slices=4
-b=2M
-
-#ignored unless using -pass 2
-maxrate=24M
-minrate=100k
-auto-alt-ref=1
-arnr-maxframes=7
-arnr-strength=5
-arnr-type=centered
diff --git a/ffpresets/libvpx-1080p50_60.avpreset
b/ffpresets/libvpx-1080p50_60.avpreset
deleted file mode 100644
index d42f731..0000000
--- a/ffpresets/libvpx-1080p50_60.avpreset
+++ /dev/null
@@ -1,17 +0,0 @@
-g=120
-lag-in-frames=25
-deafline=good
-cpu-used=0
-profile=1
-qmax=51
-qmin=11
-slices=4
-b=2M
-
-#ignored unless using -pass 2
-maxrate=24M
-minrate=100k
-auto-alt-ref=1
-arnr-maxframes=7
-arnr-strength=5
-arnr-type=centered
diff --git a/ffpresets/libvpx-360p.avpreset b/ffpresets/libvpx-360p.avpreset
deleted file mode 100644
index 2cb9e38..0000000
--- a/ffpresets/libvpx-360p.avpreset
+++ /dev/null
@@ -1,16 +0,0 @@
-g=120
-lag-in-frames=16
-deadline=good
-cpu-used=0
-profile=0
-qmax=63
-qmin=0
-b=768k
-
-#ignored unless using -pass 2
-maxrate=1.5M
-minrate=40k
-auto-alt-ref=1
-arnr-maxframes=7
-arnr-strength=5
-arnr-type=centered
diff --git a/ffpresets/libvpx-720p.avpreset b/ffpresets/libvpx-720p.avpreset
deleted file mode 100644
index 3c7e396..0000000
--- a/ffpresets/libvpx-720p.avpreset
+++ /dev/null
@@ -1,17 +0,0 @@
-g=120
-lag-in-frames=16
-deadline=good
-cpu-used=0
-profile=0
-qmax=51
-qmin=11
-slices=4
-b=2M
-
-#ignored unless using -pass 2
-maxrate=24M
-minrate=100k
-auto-alt-ref=1
-arnr-maxframes=7
-arnr-strength=5
-arnr-type=centered
diff --git a/ffpresets/libvpx-720p50_60.avpreset
b/ffpresets/libvpx-720p50_60.avpreset
deleted file mode 100644
index 6139300..0000000
--- a/ffpresets/libvpx-720p50_60.avpreset
+++ /dev/null
@@ -1,17 +0,0 @@
-g=120
-lag-in-frames=25
-deadline=good
-cpu-used=0
-profile=0
-qmax=51
-qmin=11
-slices=4
-b=2M
-
-#ignored unless using -pass 2
-maxrate=24M
-minrate=100k
-auto-alt-ref=1
-arnr-maxframes=7
-arnr-strength=5
-arnr-type=centered
diff --git a/ffpresets/libx264-baseline.avpreset
b/ffpresets/libx264-baseline.avpreset
deleted file mode 100644
index 0626e28..0000000
--- a/ffpresets/libx264-baseline.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-profile=baseline
diff --git a/ffpresets/libx264-fast.avpreset b/ffpresets/libx264-fast.avpreset
deleted file mode 100644
index a8c526e..0000000
--- a/ffpresets/libx264-fast.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-preset=fast
diff --git a/ffpresets/libx264-fast_firstpass.avpreset
b/ffpresets/libx264-fast_firstpass.avpreset
deleted file mode 100644
index d9cf5af..0000000
--- a/ffpresets/libx264-fast_firstpass.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=fast
-fastfirstpass=1
diff --git a/ffpresets/libx264-faster.avpreset
b/ffpresets/libx264-faster.avpreset
deleted file mode 100644
index e311989..0000000
--- a/ffpresets/libx264-faster.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-preset=faster
diff --git a/ffpresets/libx264-faster_firstpass.avpreset
b/ffpresets/libx264-faster_firstpass.avpreset
deleted file mode 100644
index 48a2d44..0000000
--- a/ffpresets/libx264-faster_firstpass.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=faster
-fastfirstpass=1
diff --git a/ffpresets/libx264-ipod320.avpreset
b/ffpresets/libx264-ipod320.avpreset
deleted file mode 100644
index 6323191..0000000
--- a/ffpresets/libx264-ipod320.avpreset
+++ /dev/null
@@ -1,4 +0,0 @@
-profile=baseline
-level=13
-maxrate=768000
-bufsize=3000000
diff --git a/ffpresets/libx264-ipod640.avpreset
b/ffpresets/libx264-ipod640.avpreset
deleted file mode 100644
index c2c3e1a..0000000
--- a/ffpresets/libx264-ipod640.avpreset
+++ /dev/null
@@ -1,4 +0,0 @@
-profile=baseline
-level=30
-maxrate=10000000
-bufsize=10000000
diff --git a/ffpresets/libx264-lossless_fast.avpreset
b/ffpresets/libx264-lossless_fast.avpreset
deleted file mode 100644
index 1658d56..0000000
--- a/ffpresets/libx264-lossless_fast.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=fast
-qp=0
diff --git a/ffpresets/libx264-lossless_max.avpreset
b/ffpresets/libx264-lossless_max.avpreset
deleted file mode 100644
index c25ff32..0000000
--- a/ffpresets/libx264-lossless_max.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=placebo
-qp=0
diff --git a/ffpresets/libx264-lossless_medium.avpreset
b/ffpresets/libx264-lossless_medium.avpreset
deleted file mode 100644
index f7b1d81..0000000
--- a/ffpresets/libx264-lossless_medium.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=medium
-qp=0
diff --git a/ffpresets/libx264-lossless_slow.avpreset
b/ffpresets/libx264-lossless_slow.avpreset
deleted file mode 100644
index a15ff4c..0000000
--- a/ffpresets/libx264-lossless_slow.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=slow
-qp=0
diff --git a/ffpresets/libx264-lossless_slower.avpreset
b/ffpresets/libx264-lossless_slower.avpreset
deleted file mode 100644
index bd71f03..0000000
--- a/ffpresets/libx264-lossless_slower.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=slower
-qp=0
diff --git a/ffpresets/libx264-lossless_ultrafast.avpreset
b/ffpresets/libx264-lossless_ultrafast.avpreset
deleted file mode 100644
index 4d71eb7..0000000
--- a/ffpresets/libx264-lossless_ultrafast.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=ultrafast
-qp=0
diff --git a/ffpresets/libx264-main.avpreset b/ffpresets/libx264-main.avpreset
deleted file mode 100644
index 336c69b..0000000
--- a/ffpresets/libx264-main.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-profile=main
diff --git a/ffpresets/libx264-medium.avpreset
b/ffpresets/libx264-medium.avpreset
deleted file mode 100644
index 261d584..0000000
--- a/ffpresets/libx264-medium.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-preset=medium
diff --git a/ffpresets/libx264-medium_firstpass.avpreset
b/ffpresets/libx264-medium_firstpass.avpreset
deleted file mode 100644
index 06c8f9f..0000000
--- a/ffpresets/libx264-medium_firstpass.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=medium
-fastfirstpass=1
diff --git a/ffpresets/libx264-placebo.avpreset
b/ffpresets/libx264-placebo.avpreset
deleted file mode 100644
index 93d721d..0000000
--- a/ffpresets/libx264-placebo.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-preset=placebo
diff --git a/ffpresets/libx264-placebo_firstpass.avpreset
b/ffpresets/libx264-placebo_firstpass.avpreset
deleted file mode 100644
index c8099e5..0000000
--- a/ffpresets/libx264-placebo_firstpass.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=placebo
-fastfirstpass=1
diff --git a/ffpresets/libx264-slow.avpreset b/ffpresets/libx264-slow.avpreset
deleted file mode 100644
index 85778ec..0000000
--- a/ffpresets/libx264-slow.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-preset=slow
diff --git a/ffpresets/libx264-slow_firstpass.avpreset
b/ffpresets/libx264-slow_firstpass.avpreset
deleted file mode 100644
index 9998bc9..0000000
--- a/ffpresets/libx264-slow_firstpass.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=slow
-fastfirstpass=1
diff --git a/ffpresets/libx264-slower.avpreset
b/ffpresets/libx264-slower.avpreset
deleted file mode 100644
index 87d6989..0000000
--- a/ffpresets/libx264-slower.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-preset=slower
diff --git a/ffpresets/libx264-slower_firstpass.avpreset
b/ffpresets/libx264-slower_firstpass.avpreset
deleted file mode 100644
index c798b82..0000000
--- a/ffpresets/libx264-slower_firstpass.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=slower
-fastfirstpass=1
diff --git a/ffpresets/libx264-superfast.avpreset
b/ffpresets/libx264-superfast.avpreset
deleted file mode 100644
index 1c117ec..0000000
--- a/ffpresets/libx264-superfast.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-preset=superfast
diff --git a/ffpresets/libx264-superfast_firstpass.avpreset
b/ffpresets/libx264-superfast_firstpass.avpreset
deleted file mode 100644
index fc70e09..0000000
--- a/ffpresets/libx264-superfast_firstpass.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=superfast
-fastfirstpass=1
diff --git a/ffpresets/libx264-ultrafast.avpreset
b/ffpresets/libx264-ultrafast.avpreset
deleted file mode 100644
index 9103301..0000000
--- a/ffpresets/libx264-ultrafast.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-preset=ultrafast
diff --git a/ffpresets/libx264-ultrafast_firstpass.avpreset
b/ffpresets/libx264-ultrafast_firstpass.avpreset
deleted file mode 100644
index e3aaa17..0000000
--- a/ffpresets/libx264-ultrafast_firstpass.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=ultrafast
-fastfirstpass=1
diff --git a/ffpresets/libx264-veryfast.avpreset
b/ffpresets/libx264-veryfast.avpreset
deleted file mode 100644
index fa49629..0000000
--- a/ffpresets/libx264-veryfast.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-preset=veryfast
diff --git a/ffpresets/libx264-veryfast_firstpass.avpreset
b/ffpresets/libx264-veryfast_firstpass.avpreset
deleted file mode 100644
index 4909030..0000000
--- a/ffpresets/libx264-veryfast_firstpass.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=veryfast
-fastfirstpass=1
diff --git a/ffpresets/libx264-veryslow.avpreset
b/ffpresets/libx264-veryslow.avpreset
deleted file mode 100644
index 7e01c8f..0000000
--- a/ffpresets/libx264-veryslow.avpreset
+++ /dev/null
@@ -1 +0,0 @@
-preset=veryslow
diff --git a/ffpresets/libx264-veryslow_firstpass.avpreset
b/ffpresets/libx264-veryslow_firstpass.avpreset
deleted file mode 100644
index daf5a8f..0000000
--- a/ffpresets/libx264-veryslow_firstpass.avpreset
+++ /dev/null
@@ -1,2 +0,0 @@
-preset=veryslow
-fastfirstpass=1
diff --git a/presets/libvpx-1080p.avpreset b/presets/libvpx-1080p.avpreset
new file mode 100644
index 0000000..5c7da6f
--- /dev/null
+++ b/presets/libvpx-1080p.avpreset
@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=16
+deadline=good
+cpu-used=0
+profile=1
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered
diff --git a/presets/libvpx-1080p50_60.avpreset
b/presets/libvpx-1080p50_60.avpreset
new file mode 100644
index 0000000..d42f731
--- /dev/null
+++ b/presets/libvpx-1080p50_60.avpreset
@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=25
+deafline=good
+cpu-used=0
+profile=1
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered
diff --git a/presets/libvpx-360p.avpreset b/presets/libvpx-360p.avpreset
new file mode 100644
index 0000000..2cb9e38
--- /dev/null
+++ b/presets/libvpx-360p.avpreset
@@ -0,0 +1,16 @@
+g=120
+lag-in-frames=16
+deadline=good
+cpu-used=0
+profile=0
+qmax=63
+qmin=0
+b=768k
+
+#ignored unless using -pass 2
+maxrate=1.5M
+minrate=40k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered
diff --git a/presets/libvpx-720p.avpreset b/presets/libvpx-720p.avpreset
new file mode 100644
index 0000000..3c7e396
--- /dev/null
+++ b/presets/libvpx-720p.avpreset
@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=16
+deadline=good
+cpu-used=0
+profile=0
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered
diff --git a/presets/libvpx-720p50_60.avpreset
b/presets/libvpx-720p50_60.avpreset
new file mode 100644
index 0000000..6139300
--- /dev/null
+++ b/presets/libvpx-720p50_60.avpreset
@@ -0,0 +1,17 @@
+g=120
+lag-in-frames=25
+deadline=good
+cpu-used=0
+profile=0
+qmax=51
+qmin=11
+slices=4
+b=2M
+
+#ignored unless using -pass 2
+maxrate=24M
+minrate=100k
+auto-alt-ref=1
+arnr-maxframes=7
+arnr-strength=5
+arnr-type=centered
diff --git a/presets/libx264-baseline.avpreset
b/presets/libx264-baseline.avpreset
new file mode 100644
index 0000000..0626e28
--- /dev/null
+++ b/presets/libx264-baseline.avpreset
@@ -0,0 +1 @@
+profile=baseline
diff --git a/presets/libx264-fast.avpreset b/presets/libx264-fast.avpreset
new file mode 100644
index 0000000..a8c526e
--- /dev/null
+++ b/presets/libx264-fast.avpreset
@@ -0,0 +1 @@
+preset=fast
diff --git a/presets/libx264-fast_firstpass.avpreset
b/presets/libx264-fast_firstpass.avpreset
new file mode 100644
index 0000000..d9cf5af
--- /dev/null
+++ b/presets/libx264-fast_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=fast
+fastfirstpass=1
diff --git a/presets/libx264-faster.avpreset b/presets/libx264-faster.avpreset
new file mode 100644
index 0000000..e311989
--- /dev/null
+++ b/presets/libx264-faster.avpreset
@@ -0,0 +1 @@
+preset=faster
diff --git a/presets/libx264-faster_firstpass.avpreset
b/presets/libx264-faster_firstpass.avpreset
new file mode 100644
index 0000000..48a2d44
--- /dev/null
+++ b/presets/libx264-faster_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=faster
+fastfirstpass=1
diff --git a/presets/libx264-ipod320.avpreset b/presets/libx264-ipod320.avpreset
new file mode 100644
index 0000000..6323191
--- /dev/null
+++ b/presets/libx264-ipod320.avpreset
@@ -0,0 +1,4 @@
+profile=baseline
+level=13
+maxrate=768000
+bufsize=3000000
diff --git a/presets/libx264-ipod640.avpreset b/presets/libx264-ipod640.avpreset
new file mode 100644
index 0000000..c2c3e1a
--- /dev/null
+++ b/presets/libx264-ipod640.avpreset
@@ -0,0 +1,4 @@
+profile=baseline
+level=30
+maxrate=10000000
+bufsize=10000000
diff --git a/presets/libx264-lossless_fast.avpreset
b/presets/libx264-lossless_fast.avpreset
new file mode 100644
index 0000000..1658d56
--- /dev/null
+++ b/presets/libx264-lossless_fast.avpreset
@@ -0,0 +1,2 @@
+preset=fast
+qp=0
diff --git a/presets/libx264-lossless_max.avpreset
b/presets/libx264-lossless_max.avpreset
new file mode 100644
index 0000000..c25ff32
--- /dev/null
+++ b/presets/libx264-lossless_max.avpreset
@@ -0,0 +1,2 @@
+preset=placebo
+qp=0
diff --git a/presets/libx264-lossless_medium.avpreset
b/presets/libx264-lossless_medium.avpreset
new file mode 100644
index 0000000..f7b1d81
--- /dev/null
+++ b/presets/libx264-lossless_medium.avpreset
@@ -0,0 +1,2 @@
+preset=medium
+qp=0
diff --git a/presets/libx264-lossless_slow.avpreset
b/presets/libx264-lossless_slow.avpreset
new file mode 100644
index 0000000..a15ff4c
--- /dev/null
+++ b/presets/libx264-lossless_slow.avpreset
@@ -0,0 +1,2 @@
+preset=slow
+qp=0
diff --git a/presets/libx264-lossless_slower.avpreset
b/presets/libx264-lossless_slower.avpreset
new file mode 100644
index 0000000..bd71f03
--- /dev/null
+++ b/presets/libx264-lossless_slower.avpreset
@@ -0,0 +1,2 @@
+preset=slower
+qp=0
diff --git a/presets/libx264-lossless_ultrafast.avpreset
b/presets/libx264-lossless_ultrafast.avpreset
new file mode 100644
index 0000000..4d71eb7
--- /dev/null
+++ b/presets/libx264-lossless_ultrafast.avpreset
@@ -0,0 +1,2 @@
+preset=ultrafast
+qp=0
diff --git a/presets/libx264-main.avpreset b/presets/libx264-main.avpreset
new file mode 100644
index 0000000..336c69b
--- /dev/null
+++ b/presets/libx264-main.avpreset
@@ -0,0 +1 @@
+profile=main
diff --git a/presets/libx264-medium.avpreset b/presets/libx264-medium.avpreset
new file mode 100644
index 0000000..261d584
--- /dev/null
+++ b/presets/libx264-medium.avpreset
@@ -0,0 +1 @@
+preset=medium
diff --git a/presets/libx264-medium_firstpass.avpreset
b/presets/libx264-medium_firstpass.avpreset
new file mode 100644
index 0000000..06c8f9f
--- /dev/null
+++ b/presets/libx264-medium_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=medium
+fastfirstpass=1
diff --git a/presets/libx264-placebo.avpreset b/presets/libx264-placebo.avpreset
new file mode 100644
index 0000000..93d721d
--- /dev/null
+++ b/presets/libx264-placebo.avpreset
@@ -0,0 +1 @@
+preset=placebo
diff --git a/presets/libx264-placebo_firstpass.avpreset
b/presets/libx264-placebo_firstpass.avpreset
new file mode 100644
index 0000000..c8099e5
--- /dev/null
+++ b/presets/libx264-placebo_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=placebo
+fastfirstpass=1
diff --git a/presets/libx264-slow.avpreset b/presets/libx264-slow.avpreset
new file mode 100644
index 0000000..85778ec
--- /dev/null
+++ b/presets/libx264-slow.avpreset
@@ -0,0 +1 @@
+preset=slow
diff --git a/presets/libx264-slow_firstpass.avpreset
b/presets/libx264-slow_firstpass.avpreset
new file mode 100644
index 0000000..9998bc9
--- /dev/null
+++ b/presets/libx264-slow_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=slow
+fastfirstpass=1
diff --git a/presets/libx264-slower.avpreset b/presets/libx264-slower.avpreset
new file mode 100644
index 0000000..87d6989
--- /dev/null
+++ b/presets/libx264-slower.avpreset
@@ -0,0 +1 @@
+preset=slower
diff --git a/presets/libx264-slower_firstpass.avpreset
b/presets/libx264-slower_firstpass.avpreset
new file mode 100644
index 0000000..c798b82
--- /dev/null
+++ b/presets/libx264-slower_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=slower
+fastfirstpass=1
diff --git a/presets/libx264-superfast.avpreset
b/presets/libx264-superfast.avpreset
new file mode 100644
index 0000000..1c117ec
--- /dev/null
+++ b/presets/libx264-superfast.avpreset
@@ -0,0 +1 @@
+preset=superfast
diff --git a/presets/libx264-superfast_firstpass.avpreset
b/presets/libx264-superfast_firstpass.avpreset
new file mode 100644
index 0000000..fc70e09
--- /dev/null
+++ b/presets/libx264-superfast_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=superfast
+fastfirstpass=1
diff --git a/presets/libx264-ultrafast.avpreset
b/presets/libx264-ultrafast.avpreset
new file mode 100644
index 0000000..9103301
--- /dev/null
+++ b/presets/libx264-ultrafast.avpreset
@@ -0,0 +1 @@
+preset=ultrafast
diff --git a/presets/libx264-ultrafast_firstpass.avpreset
b/presets/libx264-ultrafast_firstpass.avpreset
new file mode 100644
index 0000000..e3aaa17
--- /dev/null
+++ b/presets/libx264-ultrafast_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=ultrafast
+fastfirstpass=1
diff --git a/presets/libx264-veryfast.avpreset
b/presets/libx264-veryfast.avpreset
new file mode 100644
index 0000000..fa49629
--- /dev/null
+++ b/presets/libx264-veryfast.avpreset
@@ -0,0 +1 @@
+preset=veryfast
diff --git a/presets/libx264-veryfast_firstpass.avpreset
b/presets/libx264-veryfast_firstpass.avpreset
new file mode 100644
index 0000000..4909030
--- /dev/null
+++ b/presets/libx264-veryfast_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=veryfast
+fastfirstpass=1
diff --git a/presets/libx264-veryslow.avpreset
b/presets/libx264-veryslow.avpreset
new file mode 100644
index 0000000..7e01c8f
--- /dev/null
+++ b/presets/libx264-veryslow.avpreset
@@ -0,0 +1 @@
+preset=veryslow
diff --git a/presets/libx264-veryslow_firstpass.avpreset
b/presets/libx264-veryslow_firstpass.avpreset
new file mode 100644
index 0000000..daf5a8f
--- /dev/null
+++ b/presets/libx264-veryslow_firstpass.avpreset
@@ -0,0 +1,2 @@
+preset=veryslow
+fastfirstpass=1
--
1.7.7
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
