ffmpeg/doc
Michael Niedermayer 42c70b3584 Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386'
* commit 'dd7fc37c71955b78a2687f29e871f714d18de386':
  af_join: switch to an AVOptions-based system.

Conflicts:
	doc/filters.texi
	libavfilter/af_join.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 02:37:43 +02:00
..
doxy
examples Merge commit 'bcc94328980e6c56546792ab08b0756abdce310b' 2013-04-04 13:00:59 +02:00
all-components.texi doc: enable compilation of -all tool pages 2013-04-05 10:11:57 +02:00
APIchanges lavu/samplefmt: add av_samples_alloc_array_and_pointers() 2013-03-31 18:00:44 +02:00
authors.texi
avtools-common-opts.texi doc: document -v repeat 2013-04-04 23:36:57 +02:00
avutil.txt
bitstream_filters.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
build_system.txt
codecs.texi doc: move ffmpeg-codecs.texi content to separated file 2013-04-05 10:11:57 +02:00
decoders.texi
default.css
demuxers.texi lavf: add libquvi demuxer. 2013-04-10 12:09:20 +02:00
developer.texi Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640' 2013-04-06 13:23:38 +02:00
devices.texi doc: move ffmpeg-devices.texi content to separated file 2013-04-05 10:11:57 +02:00
doxy-wrapper.sh
Doxyfile doxygen: dont strip code comments 2013-03-31 22:34:13 +02:00
encoders.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
errno.txt
eval.texi lavu/eval: add between() function. 2013-03-22 09:20:45 +01:00
faq.texi doc: Consistently use 'filtergraph' 2013-03-31 18:22:08 -04:00
fate_config.sh.template
fate.texi doc/fate.texi: fix typo 2013-04-03 21:07:15 +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 doc: move ffmpeg-resampler.texi content to separated file 2013-04-05 10:11:57 +02:00
ffmpeg-scaler.texi doc: move ffmpeg-scaler.texi content to separated file 2013-04-05 10:11:57 +02:00
ffmpeg-utils.texi
ffmpeg.texi doc: enable compilation of -all tool pages 2013-04-05 10:11:57 +02:00
ffmpeg.txt
ffplay.texi doc: enable compilation of -all tool pages 2013-04-05 10:11:57 +02:00
ffprobe.texi doc: enable compilation of -all tool pages 2013-04-05 10:11:57 +02:00
ffprobe.xsd ffprobe: remove deprecated frame "reference" field 2013-03-17 00:27:48 +01:00
ffserver.conf
ffserver.texi doc: enable compilation of -all tool pages 2013-04-05 10:11:57 +02:00
filter_design.txt doc: Consistently use 'frame rate' everywhere 2013-03-31 18:22:08 -04:00
filters.texi Merge commit 'dd7fc37c71955b78a2687f29e871f714d18de386' 2013-04-11 02:37:43 +02:00
formats.texi doc: move ffmpeg-formats.texi content to separated file 2013-04-05 10:11:57 +02:00
general.texi EVRC decoder 2013-01-21 10:24:45 +00:00
git-howto.texi
git-howto.txt
indevs.texi doc: Consistently use 'frame rate' everywhere 2013-03-31 18:22:08 -04:00
issue_tracker.txt
libavcodec.texi
libavdevice.texi
libavfilter.texi
libavformat.texi
libavutil.texi
libswresample.texi
libswscale.texi
Makefile doc: enable compilation of -all tool pages 2013-04-05 10:11:57 +02:00
metadata.texi
mips.txt mips: Optimization of AAC psychoacoustic model functions 2013-03-23 16:19:38 +01:00
multithreading.txt Merge commit '759001c534287a96dc96d1e274665feb7059145d' 2013-03-12 03:23:28 +01:00
muxers.texi lavf/segment: add support to ffconcat segment list 2013-03-07 01:44:59 +01:00
nut.texi Drop Snow codec 2013-01-06 16:30:02 +01:00
optimization.txt Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
outdevs.texi doc: Fix some obsolete references to av* tools as ff* tools 2013-02-18 13:04:29 +01:00
platform.texi Merge remote-tracking branch 'qatar/master' 2013-03-31 11:31:19 +02:00
print_options.c Merge remote-tracking branch 'qatar/master' 2013-03-18 17:43:43 +01:00
protocols.texi rtsp: add option to set the socket timeout of the lower protocol. 2013-04-08 17:45:13 +02:00
rate_distortion.txt
RELEASE_NOTES doc: update release_notes by taking the ones from release/1.2 2013-03-19 16:21:26 +01:00
resampler.texi doc: move ffmpeg-resampler.texi content to separated file 2013-04-05 10:11:57 +02:00
scaler.texi doc: move ffmpeg-scaler.texi content to separated file 2013-04-05 10:11:57 +02:00
snow.txt Drop Snow codec 2013-01-06 16:30:02 +01:00
soc.txt
swresample.txt Fix a few "its" vs "it's" typo. 2013-02-14 23:45:48 +01:00
swscale.txt
syntax.texi lavu/parseutils: allow MM:SS format for duration in av_parse_time() 2013-02-22 23:43:46 +01:00
t2h.init Merge commit 'f90ff772e7e35b4923c2de429d1fab9f2569b568' 2013-01-27 13:32:56 +01:00
tablegen.txt
texi2pod.pl doc/texi2pod.pl: skip printing chapter names if they are disabled 2013-03-30 16:58:45 +01:00
viterbi.txt