Module: libav Branch: master Commit: 8096fdf0b6886305ea1a8cb2c869ab2732cd8e11
Author: Janne Grunau <[email protected]> Committer: Janne Grunau <[email protected]> Date: Wed Oct 19 08:22:23 2011 +0200 presets: rename presets directory --- Makefile | 2 +- doc/avconv.texi | 2 +- doc/ffmpeg.texi | 2 +- {ffpresets => presets}/libvpx-1080p.avpreset | 0 {ffpresets => presets}/libvpx-1080p50_60.avpreset | 0 {ffpresets => presets}/libvpx-360p.avpreset | 0 {ffpresets => presets}/libvpx-720p.avpreset | 0 {ffpresets => presets}/libvpx-720p50_60.avpreset | 0 {ffpresets => presets}/libx264-baseline.avpreset | 0 {ffpresets => presets}/libx264-fast.avpreset | 0 .../libx264-fast_firstpass.avpreset | 0 {ffpresets => presets}/libx264-faster.avpreset | 0 .../libx264-faster_firstpass.avpreset | 0 {ffpresets => presets}/libx264-ipod320.avpreset | 0 {ffpresets => presets}/libx264-ipod640.avpreset | 0 .../libx264-lossless_fast.avpreset | 0 .../libx264-lossless_max.avpreset | 0 .../libx264-lossless_medium.avpreset | 0 .../libx264-lossless_slow.avpreset | 0 .../libx264-lossless_slower.avpreset | 0 .../libx264-lossless_ultrafast.avpreset | 0 {ffpresets => presets}/libx264-main.avpreset | 0 {ffpresets => presets}/libx264-medium.avpreset | 0 .../libx264-medium_firstpass.avpreset | 0 {ffpresets => presets}/libx264-placebo.avpreset | 0 .../libx264-placebo_firstpass.avpreset | 0 {ffpresets => presets}/libx264-slow.avpreset | 0 .../libx264-slow_firstpass.avpreset | 0 {ffpresets => presets}/libx264-slower.avpreset | 0 .../libx264-slower_firstpass.avpreset | 0 {ffpresets => presets}/libx264-superfast.avpreset | 0 .../libx264-superfast_firstpass.avpreset | 0 {ffpresets => presets}/libx264-ultrafast.avpreset | 0 .../libx264-ultrafast_firstpass.avpreset | 0 {ffpresets => presets}/libx264-veryfast.avpreset | 0 .../libx264-veryfast_firstpass.avpreset | 0 {ffpresets => presets}/libx264-veryslow.avpreset | 0 .../libx264-veryslow_firstpass.avpreset | 0 38 files changed, 3 insertions(+), 3 deletions(-) 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/presets/libvpx-1080p.avpreset similarity index 100% rename from ffpresets/libvpx-1080p.avpreset rename to presets/libvpx-1080p.avpreset diff --git a/ffpresets/libvpx-1080p50_60.avpreset b/presets/libvpx-1080p50_60.avpreset similarity index 100% rename from ffpresets/libvpx-1080p50_60.avpreset rename to presets/libvpx-1080p50_60.avpreset diff --git a/ffpresets/libvpx-360p.avpreset b/presets/libvpx-360p.avpreset similarity index 100% rename from ffpresets/libvpx-360p.avpreset rename to presets/libvpx-360p.avpreset diff --git a/ffpresets/libvpx-720p.avpreset b/presets/libvpx-720p.avpreset similarity index 100% rename from ffpresets/libvpx-720p.avpreset rename to presets/libvpx-720p.avpreset diff --git a/ffpresets/libvpx-720p50_60.avpreset b/presets/libvpx-720p50_60.avpreset similarity index 100% rename from ffpresets/libvpx-720p50_60.avpreset rename to presets/libvpx-720p50_60.avpreset diff --git a/ffpresets/libx264-baseline.avpreset b/presets/libx264-baseline.avpreset similarity index 100% rename from ffpresets/libx264-baseline.avpreset rename to presets/libx264-baseline.avpreset diff --git a/ffpresets/libx264-fast.avpreset b/presets/libx264-fast.avpreset similarity index 100% rename from ffpresets/libx264-fast.avpreset rename to presets/libx264-fast.avpreset diff --git a/ffpresets/libx264-fast_firstpass.avpreset b/presets/libx264-fast_firstpass.avpreset similarity index 100% rename from ffpresets/libx264-fast_firstpass.avpreset rename to presets/libx264-fast_firstpass.avpreset diff --git a/ffpresets/libx264-faster.avpreset b/presets/libx264-faster.avpreset similarity index 100% rename from ffpresets/libx264-faster.avpreset rename to presets/libx264-faster.avpreset diff --git a/ffpresets/libx264-faster_firstpass.avpreset b/presets/libx264-faster_firstpass.avpreset similarity index 100% rename from ffpresets/libx264-faster_firstpass.avpreset rename to presets/libx264-faster_firstpass.avpreset diff --git a/ffpresets/libx264-ipod320.avpreset b/presets/libx264-ipod320.avpreset similarity index 100% rename from ffpresets/libx264-ipod320.avpreset rename to presets/libx264-ipod320.avpreset diff --git a/ffpresets/libx264-ipod640.avpreset b/presets/libx264-ipod640.avpreset similarity index 100% rename from ffpresets/libx264-ipod640.avpreset rename to presets/libx264-ipod640.avpreset diff --git a/ffpresets/libx264-lossless_fast.avpreset b/presets/libx264-lossless_fast.avpreset similarity index 100% rename from ffpresets/libx264-lossless_fast.avpreset rename to presets/libx264-lossless_fast.avpreset diff --git a/ffpresets/libx264-lossless_max.avpreset b/presets/libx264-lossless_max.avpreset similarity index 100% rename from ffpresets/libx264-lossless_max.avpreset rename to presets/libx264-lossless_max.avpreset diff --git a/ffpresets/libx264-lossless_medium.avpreset b/presets/libx264-lossless_medium.avpreset similarity index 100% rename from ffpresets/libx264-lossless_medium.avpreset rename to presets/libx264-lossless_medium.avpreset diff --git a/ffpresets/libx264-lossless_slow.avpreset b/presets/libx264-lossless_slow.avpreset similarity index 100% rename from ffpresets/libx264-lossless_slow.avpreset rename to presets/libx264-lossless_slow.avpreset diff --git a/ffpresets/libx264-lossless_slower.avpreset b/presets/libx264-lossless_slower.avpreset similarity index 100% rename from ffpresets/libx264-lossless_slower.avpreset rename to presets/libx264-lossless_slower.avpreset diff --git a/ffpresets/libx264-lossless_ultrafast.avpreset b/presets/libx264-lossless_ultrafast.avpreset similarity index 100% rename from ffpresets/libx264-lossless_ultrafast.avpreset rename to presets/libx264-lossless_ultrafast.avpreset diff --git a/ffpresets/libx264-main.avpreset b/presets/libx264-main.avpreset similarity index 100% rename from ffpresets/libx264-main.avpreset rename to presets/libx264-main.avpreset diff --git a/ffpresets/libx264-medium.avpreset b/presets/libx264-medium.avpreset similarity index 100% rename from ffpresets/libx264-medium.avpreset rename to presets/libx264-medium.avpreset diff --git a/ffpresets/libx264-medium_firstpass.avpreset b/presets/libx264-medium_firstpass.avpreset similarity index 100% rename from ffpresets/libx264-medium_firstpass.avpreset rename to presets/libx264-medium_firstpass.avpreset diff --git a/ffpresets/libx264-placebo.avpreset b/presets/libx264-placebo.avpreset similarity index 100% rename from ffpresets/libx264-placebo.avpreset rename to presets/libx264-placebo.avpreset diff --git a/ffpresets/libx264-placebo_firstpass.avpreset b/presets/libx264-placebo_firstpass.avpreset similarity index 100% rename from ffpresets/libx264-placebo_firstpass.avpreset rename to presets/libx264-placebo_firstpass.avpreset diff --git a/ffpresets/libx264-slow.avpreset b/presets/libx264-slow.avpreset similarity index 100% rename from ffpresets/libx264-slow.avpreset rename to presets/libx264-slow.avpreset diff --git a/ffpresets/libx264-slow_firstpass.avpreset b/presets/libx264-slow_firstpass.avpreset similarity index 100% rename from ffpresets/libx264-slow_firstpass.avpreset rename to presets/libx264-slow_firstpass.avpreset diff --git a/ffpresets/libx264-slower.avpreset b/presets/libx264-slower.avpreset similarity index 100% rename from ffpresets/libx264-slower.avpreset rename to presets/libx264-slower.avpreset diff --git a/ffpresets/libx264-slower_firstpass.avpreset b/presets/libx264-slower_firstpass.avpreset similarity index 100% rename from ffpresets/libx264-slower_firstpass.avpreset rename to presets/libx264-slower_firstpass.avpreset diff --git a/ffpresets/libx264-superfast.avpreset b/presets/libx264-superfast.avpreset similarity index 100% rename from ffpresets/libx264-superfast.avpreset rename to presets/libx264-superfast.avpreset diff --git a/ffpresets/libx264-superfast_firstpass.avpreset b/presets/libx264-superfast_firstpass.avpreset similarity index 100% rename from ffpresets/libx264-superfast_firstpass.avpreset rename to presets/libx264-superfast_firstpass.avpreset diff --git a/ffpresets/libx264-ultrafast.avpreset b/presets/libx264-ultrafast.avpreset similarity index 100% rename from ffpresets/libx264-ultrafast.avpreset rename to presets/libx264-ultrafast.avpreset diff --git a/ffpresets/libx264-ultrafast_firstpass.avpreset b/presets/libx264-ultrafast_firstpass.avpreset similarity index 100% rename from ffpresets/libx264-ultrafast_firstpass.avpreset rename to presets/libx264-ultrafast_firstpass.avpreset diff --git a/ffpresets/libx264-veryfast.avpreset b/presets/libx264-veryfast.avpreset similarity index 100% rename from ffpresets/libx264-veryfast.avpreset rename to presets/libx264-veryfast.avpreset diff --git a/ffpresets/libx264-veryfast_firstpass.avpreset b/presets/libx264-veryfast_firstpass.avpreset similarity index 100% rename from ffpresets/libx264-veryfast_firstpass.avpreset rename to presets/libx264-veryfast_firstpass.avpreset diff --git a/ffpresets/libx264-veryslow.avpreset b/presets/libx264-veryslow.avpreset similarity index 100% rename from ffpresets/libx264-veryslow.avpreset rename to presets/libx264-veryslow.avpreset diff --git a/ffpresets/libx264-veryslow_firstpass.avpreset b/presets/libx264-veryslow_firstpass.avpreset similarity index 100% rename from ffpresets/libx264-veryslow_firstpass.avpreset rename to presets/libx264-veryslow_firstpass.avpreset _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
