ffmpeg/doc
Michael Niedermayer 5e3da25618 Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04'
* commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11 01:27:38 +02:00
..
examples avcodec: export motion vectors in frame side data on demand 2014-08-18 14:13:57 +02:00
APIchanges Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5' 2014-08-28 22:23:01 +02:00
authors.texi doc: use a common authors.texi file blurb 2012-12-19 09:33:43 +01:00
bitstream_filters.texi doc/bitstream_filters: document imxdump 2014-06-18 12:59:15 -08: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 avfilter: add codecview filter 2014-08-24 14:35:11 +02:00
decoders.texi doc/decoders: mention native Opus decoder 2014-07-27 13:46:48 -08:00
default.css doc: restore default.css 2014-07-20 02:01:50 +02:00
demuxers.texi doc/demuxers: document gif demuxer 2014-09-03 10:16:05 -08:00
developer.texi doc: Change wrong term to avoid confusion 2014-08-18 13:29:25 +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 Adds support for setting aq_mode in libvpx encoder 2014-08-27 23:12:47 -03:00
errno.txt
faq.texi fix various typos 2014-06-03 10:58:19 -08: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 doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
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 doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
ffmpeg-formats.texi doc: move ffmpeg-formats.texi content to separated file 2013-04-05 10:11:57 +02:00
ffmpeg-protocols.texi doc: extend "See Also" chapters in component manuals 2012-12-19 09:33:44 +01:00
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 Merge commit '775a0b04f0cf8102fe322b2ee03fe1a0633dea04' 2014-09-11 01:27:38 +02:00
ffmpeg.txt
ffplay.texi Print bits_per_raw_sample for ffprobe -show_streams. 2014-09-08 17:49:20 +02:00
ffprobe.texi doc/ffprobe: fix -show_entries example 2014-08-28 12:20:18 +02:00
ffprobe.xsd Print bits_per_raw_sample for ffprobe -show_streams. 2014-09-08 17:49:20 +02: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: deprecate Port and BindAddress options in favor of HTTPPort and HTTPBindAddress 2014-08-17 22:51:45 -04:00
fftools-common-opts.texi Replace incorrect use of "multiply" with "multiple" 2014-08-27 16:00:17 -08:00
filter_design.txt doc/filter_design.txt: Fix duplicate words 2013-08-12 19:40:29 +02:00
filters.texi doc/filters.texi: improve the wording of the expr_int_format documentation 2014-09-07 18:29:06 +02:00
formats.texi avformat/options_table: add named constants for avoid_negative_ts 2014-02-24 19:46:11 +01:00
general.texi general: Fix usage of @float 2014-09-01 16:21:44 +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 doc/indevs: mention required configure options 2014-07-31 15:00:41 -08:00
issue_tracker.txt doc/issue_tracker: Correct sub-domain for mailing list 2014-07-20 20:57:53 +02:00
libavcodec.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavdevice.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
libavfilter.texi doc: Libavfilter English cleanup 2014-04-12 14:34:11 +02:00
libavformat.texi doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
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 doc: extend "See Also" chapters in library manuals 2012-12-19 09:33:44 +01:00
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 Merge commit '759001c534287a96dc96d1e274665feb7059145d' 2013-03-12 03:23:28 +01:00
muxers.texi doc/muxers/segment: reword text for examples, improve consistency 2014-09-07 13:17:46 +02: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 Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
protocols.texi Merge commit '7e38903b5c86a759549e70647ae42bb22d353b14' 2014-08-13 22:54:31 +02:00
rate_distortion.txt miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
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 Fix a few "its" vs "it's" typo. 2013-02-14 23:45:48 +01:00
swscale.txt
t2h.init doc: Copyright in CSS, CSS split in 2 files 2014-09-06 01:37:31 +02:00
t2h.pm doc: Copyright in CSS, CSS split in 2 files 2014-09-06 01:37:31 +02: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: add a tutorial for writing filters. 2014-05-26 21:28:19 +02:00