presets: rename presets directory

38 files changed, 3 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index feb57cbea0..04af278b93 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 6e38a47b78..c298dc5710 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 22989c0723..968d4f68b7 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/presets/libvpx-1080p.avpreset
index 5c7da6fb86..5c7da6fb86 100644
--- a/ffpresets/libvpx-1080p.avpreset
+++ b/presets/libvpx-1080p.avpreset
diff --git a/ffpresets/libvpx-1080p50_60.avpreset b/presets/libvpx-1080p50_60.avpreset
index d42f731744..d42f731744 100644
--- a/ffpresets/libvpx-1080p50_60.avpreset
+++ b/presets/libvpx-1080p50_60.avpreset
diff --git a/ffpresets/libvpx-360p.avpreset b/presets/libvpx-360p.avpreset
index 2cb9e380f3..2cb9e380f3 100644
--- a/ffpresets/libvpx-360p.avpreset
+++ b/presets/libvpx-360p.avpreset
diff --git a/ffpresets/libvpx-720p.avpreset b/presets/libvpx-720p.avpreset
index 3c7e396ad6..3c7e396ad6 100644
--- a/ffpresets/libvpx-720p.avpreset
+++ b/presets/libvpx-720p.avpreset
diff --git a/ffpresets/libvpx-720p50_60.avpreset b/presets/libvpx-720p50_60.avpreset
index 613930063e..613930063e 100644
--- a/ffpresets/libvpx-720p50_60.avpreset
+++ b/presets/libvpx-720p50_60.avpreset
diff --git a/ffpresets/libx264-baseline.avpreset b/presets/libx264-baseline.avpreset
index 0626e28440..0626e28440 100644
--- a/ffpresets/libx264-baseline.avpreset
+++ b/presets/libx264-baseline.avpreset
diff --git a/ffpresets/libx264-fast.avpreset b/presets/libx264-fast.avpreset
index a8c526e8b4..a8c526e8b4 100644
--- a/ffpresets/libx264-fast.avpreset
+++ b/presets/libx264-fast.avpreset
diff --git a/ffpresets/libx264-fast_firstpass.avpreset b/presets/libx264-fast_firstpass.avpreset
index d9cf5afe0e..d9cf5afe0e 100644
--- a/ffpresets/libx264-fast_firstpass.avpreset
+++ b/presets/libx264-fast_firstpass.avpreset
diff --git a/ffpresets/libx264-faster.avpreset b/presets/libx264-faster.avpreset
index e311989bbb..e311989bbb 100644
--- a/ffpresets/libx264-faster.avpreset
+++ b/presets/libx264-faster.avpreset
diff --git a/ffpresets/libx264-faster_firstpass.avpreset b/presets/libx264-faster_firstpass.avpreset
index 48a2d443bc..48a2d443bc 100644
--- a/ffpresets/libx264-faster_firstpass.avpreset
+++ b/presets/libx264-faster_firstpass.avpreset
diff --git a/ffpresets/libx264-ipod320.avpreset b/presets/libx264-ipod320.avpreset
index 6323191740..6323191740 100644
--- a/ffpresets/libx264-ipod320.avpreset
+++ b/presets/libx264-ipod320.avpreset
diff --git a/ffpresets/libx264-ipod640.avpreset b/presets/libx264-ipod640.avpreset
index c2c3e1a88e..c2c3e1a88e 100644
--- a/ffpresets/libx264-ipod640.avpreset
+++ b/presets/libx264-ipod640.avpreset
diff --git a/ffpresets/libx264-lossless_fast.avpreset b/presets/libx264-lossless_fast.avpreset
index 1658d563aa..1658d563aa 100644
--- a/ffpresets/libx264-lossless_fast.avpreset
+++ b/presets/libx264-lossless_fast.avpreset
diff --git a/ffpresets/libx264-lossless_max.avpreset b/presets/libx264-lossless_max.avpreset
index c25ff32d16..c25ff32d16 100644
--- a/ffpresets/libx264-lossless_max.avpreset
+++ b/presets/libx264-lossless_max.avpreset
diff --git a/ffpresets/libx264-lossless_medium.avpreset b/presets/libx264-lossless_medium.avpreset
index f7b1d81f39..f7b1d81f39 100644
--- a/ffpresets/libx264-lossless_medium.avpreset
+++ b/presets/libx264-lossless_medium.avpreset
diff --git a/ffpresets/libx264-lossless_slow.avpreset b/presets/libx264-lossless_slow.avpreset
index a15ff4c426..a15ff4c426 100644
--- a/ffpresets/libx264-lossless_slow.avpreset
+++ b/presets/libx264-lossless_slow.avpreset
diff --git a/ffpresets/libx264-lossless_slower.avpreset b/presets/libx264-lossless_slower.avpreset
index bd71f03291..bd71f03291 100644
--- a/ffpresets/libx264-lossless_slower.avpreset
+++ b/presets/libx264-lossless_slower.avpreset
diff --git a/ffpresets/libx264-lossless_ultrafast.avpreset b/presets/libx264-lossless_ultrafast.avpreset
index 4d71eb72aa..4d71eb72aa 100644
--- a/ffpresets/libx264-lossless_ultrafast.avpreset
+++ b/presets/libx264-lossless_ultrafast.avpreset
diff --git a/ffpresets/libx264-main.avpreset b/presets/libx264-main.avpreset
index 336c69b3af..336c69b3af 100644
--- a/ffpresets/libx264-main.avpreset
+++ b/presets/libx264-main.avpreset
diff --git a/ffpresets/libx264-medium.avpreset b/presets/libx264-medium.avpreset
index 261d584f95..261d584f95 100644
--- a/ffpresets/libx264-medium.avpreset
+++ b/presets/libx264-medium.avpreset
diff --git a/ffpresets/libx264-medium_firstpass.avpreset b/presets/libx264-medium_firstpass.avpreset
index 06c8f9f8fb..06c8f9f8fb 100644
--- a/ffpresets/libx264-medium_firstpass.avpreset
+++ b/presets/libx264-medium_firstpass.avpreset
diff --git a/ffpresets/libx264-placebo.avpreset b/presets/libx264-placebo.avpreset
index 93d721d004..93d721d004 100644
--- a/ffpresets/libx264-placebo.avpreset
+++ b/presets/libx264-placebo.avpreset
diff --git a/ffpresets/libx264-placebo_firstpass.avpreset b/presets/libx264-placebo_firstpass.avpreset
index c8099e50c7..c8099e50c7 100644
--- a/ffpresets/libx264-placebo_firstpass.avpreset
+++ b/presets/libx264-placebo_firstpass.avpreset
diff --git a/ffpresets/libx264-slow.avpreset b/presets/libx264-slow.avpreset
index 85778ec8ba..85778ec8ba 100644
--- a/ffpresets/libx264-slow.avpreset
+++ b/presets/libx264-slow.avpreset
diff --git a/ffpresets/libx264-slow_firstpass.avpreset b/presets/libx264-slow_firstpass.avpreset
index 9998bc95a2..9998bc95a2 100644
--- a/ffpresets/libx264-slow_firstpass.avpreset
+++ b/presets/libx264-slow_firstpass.avpreset
diff --git a/ffpresets/libx264-slower.avpreset b/presets/libx264-slower.avpreset
index 87d69893f2..87d69893f2 100644
--- a/ffpresets/libx264-slower.avpreset
+++ b/presets/libx264-slower.avpreset
diff --git a/ffpresets/libx264-slower_firstpass.avpreset b/presets/libx264-slower_firstpass.avpreset
index c798b82872..c798b82872 100644
--- a/ffpresets/libx264-slower_firstpass.avpreset
+++ b/presets/libx264-slower_firstpass.avpreset
diff --git a/ffpresets/libx264-superfast.avpreset b/presets/libx264-superfast.avpreset
index 1c117ecf60..1c117ecf60 100644
--- a/ffpresets/libx264-superfast.avpreset
+++ b/presets/libx264-superfast.avpreset
diff --git a/ffpresets/libx264-superfast_firstpass.avpreset b/presets/libx264-superfast_firstpass.avpreset
index fc70e0970b..fc70e0970b 100644
--- a/ffpresets/libx264-superfast_firstpass.avpreset
+++ b/presets/libx264-superfast_firstpass.avpreset
diff --git a/ffpresets/libx264-ultrafast.avpreset b/presets/libx264-ultrafast.avpreset
index 910330188f..910330188f 100644
--- a/ffpresets/libx264-ultrafast.avpreset
+++ b/presets/libx264-ultrafast.avpreset
diff --git a/ffpresets/libx264-ultrafast_firstpass.avpreset b/presets/libx264-ultrafast_firstpass.avpreset
index e3aaa17a2e..e3aaa17a2e 100644
--- a/ffpresets/libx264-ultrafast_firstpass.avpreset
+++ b/presets/libx264-ultrafast_firstpass.avpreset
diff --git a/ffpresets/libx264-veryfast.avpreset b/presets/libx264-veryfast.avpreset
index fa49629b35..fa49629b35 100644
--- a/ffpresets/libx264-veryfast.avpreset
+++ b/presets/libx264-veryfast.avpreset
diff --git a/ffpresets/libx264-veryfast_firstpass.avpreset b/presets/libx264-veryfast_firstpass.avpreset
index 4909030551..4909030551 100644
--- a/ffpresets/libx264-veryfast_firstpass.avpreset
+++ b/presets/libx264-veryfast_firstpass.avpreset
diff --git a/ffpresets/libx264-veryslow.avpreset b/presets/libx264-veryslow.avpreset
index 7e01c8f5c1..7e01c8f5c1 100644
--- a/ffpresets/libx264-veryslow.avpreset
+++ b/presets/libx264-veryslow.avpreset
diff --git a/ffpresets/libx264-veryslow_firstpass.avpreset b/presets/libx264-veryslow_firstpass.avpreset
index daf5a8f4d5..daf5a8f4d5 100644
--- a/ffpresets/libx264-veryslow_firstpass.avpreset
+++ b/presets/libx264-veryslow_firstpass.avpreset