Michael Niedermayer 99091ff217 Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266' ...

* commit '205a4502d3da9de2db75d2c965c9d065574e9266':
  doc: Clarify the avconv section about -re

Conflicts:
	doc/ffmpeg.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-08-11 11:49:47 +02:00

..

doxy

…

examples

doc/examples/filtering_audio: make const arrays also static

2013-08-03 22:22:03 +02:00

APIchanges

Merge commit '5a9a9d4a2abefa63d9a898ce26715453c569e89d'

2013-08-11 10:45:13 +02:00

authors.texi

…

avtools-common-opts.texi

doc: document -opencl_options option in ff* tools manuals

2013-04-14 20:30:34 +02:00

avutil.txt

…

bitstream_filters.texi

doc/bitstream_filters: document dump_extra

2013-07-17 09:31:02 +02:00

build_system.txt

…

codecs.texi

doc/codecs: fix dangling reference to codec-options chapter

2013-07-27 16:50:19 +02:00

decoders.texi

doc/decoders: document libopus decoder

2013-06-28 13:09:10 +02:00

default.css

…

demuxers.texi

doc: apply various grammar fixes

2013-08-10 10:07:30 +02:00

developer.texi

Merge remote-tracking branch 'qatar/master'

2013-07-28 14:21:11 +02:00

devices.texi

…

doxy-wrapper.sh

…

Doxyfile

Update back for git master

2013-07-10 03:14:23 +02:00

encoders.texi

Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'

2013-08-06 15:26:04 +02:00

errno.txt

…

faq.texi

Merge remote-tracking branch 'qatar/master'

2013-07-26 11:12:11 +02: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

…

ffmpeg-devices.texi

…

ffmpeg-filters.texi

…

ffmpeg-formats.texi

…

ffmpeg-protocols.texi

…

ffmpeg-resampler.texi

…

ffmpeg-scaler.texi

…

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 '205a4502d3da9de2db75d2c965c9d065574e9266'

2013-08-11 11:49:47 +02:00

ffmpeg.txt

…

ffplay.texi

doc: remove all-components.texi, include its content verbatim

2013-04-25 11:19:53 +02:00

ffprobe.texi

ffprobe: add -show_programs option

2013-07-28 16:39:06 +02:00

ffprobe.xsd

ffprobe: add -show_programs option

2013-07-28 16:39:06 +02:00

ffserver.conf

…

ffserver.texi

doc: remove all-components.texi, include its content verbatim

2013-04-25 11:19:53 +02:00

filter_design.txt

…

filters.texi

doc/filters: fix sine sample_rate abbreviation

2013-08-10 10:11:09 +02:00

formats.texi

doc/formats: add section describing stream specifiers

2013-07-11 00:35:35 +02:00

general.texi

Merge commit '3e5898782dce60334ab294821ca00b19c648cf66'

2013-08-08 12:11:33 +02:00

git-howto.texi

…

git-howto.txt

…

indevs.texi

v4l2: make possible to disable libv4l2 at runtime.

2013-05-22 19:49:29 +02:00

issue_tracker.txt

update all trac links to use the trac subdomain

2013-06-29 19:27:49 +02:00

libavcodec.texi

…

libavdevice.texi

…

libavfilter.texi

…

libavformat.texi

…

libavutil.texi

doc/libavutil: remove include of opencl.texi

2013-04-12 18:21:57 +02:00

libswresample.texi

…

libswscale.texi

…

Makefile

Revert "doc: add script to compute texi files dependencies"

2013-07-03 12:59:59 +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

doc/muxers: Document use case of mpegts muxer option tables_version

2013-08-04 13:35:54 +02:00

nut.texi

…

optimization.txt

…

outdevs.texi

doc: apply various grammar fixes

2013-08-10 10:07:30 +02:00

platform.texi

Merge commit 'b0ce601c160c87349d093d7e542b5c752754f598'

2013-06-25 10:46:52 +02:00

print_options.c

Merge commit '79be2c325c5ee8f7ac9e28399e51986ebe99bb3c'

2013-08-03 09:22:30 +02:00

protocols.texi

Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'

2013-08-11 11:37:57 +02:00

rate_distortion.txt

…

RELEASE_NOTES

Update for 2.0

2013-07-10 02:15:43 +02:00

resampler.texi

doc: add "rematrix_maxval"

2013-07-22 03:37:55 +02:00

scaler.texi

…

snow.txt

…

soc.txt

…

swresample.txt

…

swscale.txt

…

t2h.init

…

tablegen.txt

…

texi2pod.pl

…

utils.texi

doc/utils: use @code markup for opencl function names.

2013-04-12 23:10:59 +02:00

viterbi.txt

…