1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
FFmpeg/doc
Werner Robitza beedeb4399 doc/ffmpeg: mention both ffpreset/avpreset in documentation, remove superfluous example
ffmpeg looks for both .ffpreset and .avpreset files depending on whether the
-[avsf]pre or -pre option is used. Added two sections for each type of preset
including the rules according to which files are searched.

(Notably, the lookup order is swapped for avpreset files, because it first
looks for <codec>_<arg>.avpreset and then for <arg>.avpreset.)

This removes the section explaining -pre only, which was under "Examples",
where it did not really make sense.

Signed-off-by: Werner Robitza <werner.robitza@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-05 04:34:37 +01:00
..
examples doc/examples/filtering_video: fix frame rate 2014-12-05 16:52:19 +01:00
APIchanges Merge commit 'c220a60f92dde9c7c118fc4deddff5c1f617cda9' 2014-12-27 13:06:25 +01:00
authors.texi
bitstream_filters.texi doc: mention the noise_bsf parameter in the docs 2014-12-01 23:47:07 +01:00
bootstrap.min.css doc: Copyright in CSS, CSS split in 2 files 2014-09-06 01:37:31 +02:00
build_system.txt doc/build_system: document examples and config targets 2014-06-25 01:00:05 +02:00
codecs.texi doc: fix spelling errors 2014-12-01 00:31:06 +01:00
decoders.texi doc: Use the correct @subsection tag 2014-12-07 21:50:47 +01:00
default.css doc: restore default.css 2014-07-20 02:01:50 +02:00
demuxers.texi doc: add entry for APNG demuxer where needed. 2014-11-25 18:28:32 +01:00
developer.texi docs: add example around the suggested commit message format 2014-09-12 01:59:44 +02:00
devices.texi doc: remove encoder/muxer/sinks docs from ffplay- and ffprobe-all 2014-01-09 12:12:10 +01:00
doxy-wrapper.sh doc: make doxygen program configurable 2014-07-08 02:08:04 +02:00
Doxyfile doc/Doxyfile: use 5 columns for alphabetical index 2014-07-08 00:43:18 +02:00
encoders.texi doc/encoders: add basic libx265 documentation 2014-10-15 09:45:54 -08:00
errno.txt
faq.texi doc/faq: explain pkg-config basic setup. 2014-12-23 14:38:11 +01:00
fate_config.sh.template Merge remote-tracking branch 'qatar/master' 2013-05-29 11:19:25 +02:00
fate.texi Merge remote-tracking branch 'qatar/master' 2013-07-28 14:21:11 +02:00
ffmpeg-bitstream-filters.texi
ffmpeg-codecs.texi doc: move ffmpeg-codecs.texi content to separated file 2013-04-05 10:11:57 +02:00
ffmpeg-devices.texi doc: move ffmpeg-devices.texi content to separated file 2013-04-05 10:11:57 +02:00
ffmpeg-filters.texi
ffmpeg-formats.texi doc: move ffmpeg-formats.texi content to separated file 2013-04-05 10:11:57 +02:00
ffmpeg-protocols.texi
ffmpeg-resampler.texi Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission 2014-03-06 21:12:40 +01:00
ffmpeg-scaler.texi Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission 2014-03-06 21:12:40 +01:00
ffmpeg-utils.texi doc: merge syntax.texi, eval.texi and opencl.texi into utils.texi 2013-04-12 18:21:57 +02:00
ffmpeg.texi doc/ffmpeg: mention both ffpreset/avpreset in documentation, remove superfluous example 2015-01-05 04:34:37 +01:00
ffmpeg.txt
ffplay.texi ffplay: add support for stream specifiers in -ast, -vst, -sst options 2015-01-01 14:38:12 +01:00
ffprobe.texi ffprobe: add -show_pixel_formats option 2014-10-07 23:18:15 +02:00
ffprobe.xsd ffprobe: Support extracting the number of reference frames 2014-12-30 17:55:20 +01:00
ffserver.conf ffserver: deprecate Port and BindAddress options in favor of HTTPPort and HTTPBindAddress 2014-08-17 22:51:45 -04:00
ffserver.texi ffserver: allow skip setting defaults 2014-11-26 23:32:33 +01:00
fftools-common-opts.texi doc: add FFREPORT example 2014-12-12 16:51:16 -09:00
filter_design.txt doc/filter_design.txt: Fix duplicate words 2013-08-12 19:40:29 +02:00
filters.texi doc/filters: document bit-depth independent cropdetect limit 2014-12-31 04:49:48 +01:00
formats.texi doc: fix spelling errors 2014-12-01 00:31:06 +01:00
general.texi Added STL demuxer and decoder 2014-10-22 23:12:38 +02:00
git-howto.texi Fix spelling errors in texi files: accomodate -> accommodate allows to -> allows one to choosen -> chosen compability -> compatibility explictly -> explicitly overriden -> overridden specifed -> specified Trasmission -> Transmission 2014-03-06 21:12:40 +01:00
indevs.texi lavd/lavfi: allow to extract subcc. 2015-01-02 20:17:05 +01:00
issue_tracker.txt doc/issue_tracker: Correct sub-domain for mailing list 2014-07-20 20:57:53 +02:00
libavcodec.texi
libavdevice.texi
libavfilter.texi doc: Libavfilter English cleanup 2014-04-12 14:34:11 +02:00
libavformat.texi
libavutil.texi doc/libavutil: add things from avutil.txt 2013-11-14 09:51:10 +01:00
libswresample.texi Fix wrong use of "an" in some comments. 2013-08-12 03:27:26 +02:00
libswscale.texi
Makefile Use makeinfo to generate html doc for the new website 2014-09-04 02:34:20 +02:00
metadata.texi doc/metadata: add notes and examples regarding metadata usage with ffmpeg 2013-06-11 01:07:16 +02:00
mips.txt libavcodec: Implementation of 32 bit fixed point FFT 2013-08-04 14:01:41 +02:00
multithreading.txt
muxers.texi avformat/hlsenc: added segment file deletion 2014-12-10 23:49:25 +01:00
nut.texi Merge commit 'c94e2e85cb6af8a570d8542a830556243bd32873' 2014-05-29 01:13:59 +02:00
optimization.txt Merge commit 'e3fcb14347466095839c2a3c47ebecff02da891e' 2014-07-01 15:22:11 +02:00
outdevs.texi ffmpeg: add -devices param 2014-05-28 03:52:50 +02:00
platform.texi Use makeinfo to generate html doc for the new website 2014-09-04 02:34:20 +02:00
print_options.c doc: fix spelling errors 2014-12-01 00:31:06 +01:00
protocols.texi doc: fix the the typos 2014-11-22 02:09:09 +01:00
rate_distortion.txt
resampler.texi doc: add a few links to the Channel Layout syntax section 2013-10-25 15:44:12 +02:00
scaler.texi swscale: add two spatially stable dithering methods 2014-03-25 13:48:06 +01:00
snow.txt doc/snow: remove possibly wrong todo item 2014-08-26 01:19:26 +02:00
style.min.css doc: Copyright in CSS, CSS split in 2 files 2014-09-06 01:37:31 +02:00
swresample.txt
swscale.txt
t2h.init doc: Copyright in CSS, CSS split in 2 files 2014-09-06 01:37:31 +02:00
t2h.pm doc: html: Use native viewport 2014-12-06 02:48:17 +01:00
tablegen.txt
texi2pod.pl Merge commit '94f084324e648876508bed546d950762f10b875e' 2014-09-03 12:24:47 +02:00
texidep.pl doc: add script to compute texi files dependencies 2013-12-06 10:40:38 +01:00
utils.texi lavu/eval: add clip function 2014-07-17 11:29:01 +02:00
writing_filters.txt doc/writing_filters: use ffmpeg.org instead of wikimedia.org for lena image 2014-11-19 19:55:02 +01:00