Michael Niedermayer 2b8effcda3 Merge commit '9920a8a83f578821e00212da6b79c8997a725fa8' into release/1.1 ...

* commit '9920a8a83f578821e00212da6b79c8997a725fa8':
  doc: Fix syntax and logical errors in avconv stream combination example

Conflicts:
	doc/ffmpeg.texi

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

2014-12-21 04:04:48 +01:00

..

doxy

…

examples

doc/examples: fix assignments in if()

2013-01-18 05:14:30 +01:00

APIchanges

doc/APIchanges: List merge commit hashes and version numbers

2013-02-26 03:39:44 +01:00

authors.texi

doc: use a common authors.texi file blurb

2012-12-19 09:33:43 +01:00

avtools-common-opts.texi

doc: remove inclusion of libav* documentation in tools

2012-12-20 23:48:23 +01:00

avutil.txt

…

bitstream_filters.texi

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-19 08:11:11 +01:00

build_system.txt

…

decoders.texi

doc/decoders: document libopus decoder

2013-08-28 09:35:19 -07:00

default.css

doc/default.css: use ffmpeg.org website CSS

2012-12-22 00:38:48 +01:00

demuxers.texi

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-19 08:11:11 +01:00

developer.texi

Merge remote-tracking branch 'qatar/release/9' into release/1.1

2013-02-26 03:09:41 +01:00

doxy-wrapper.sh

…

Doxyfile

Update for 1.1.14

2014-08-30 21:44:13 +02:00

encoders.texi

avcodec/libopusenc: change default frame duration to 20 ms

2014-03-07 04:04:07 +01:00

errno.txt

…

eval.texi

…

faq.texi

doc/faq: add -start_number example

2013-01-02 23:52:35 +01:00

fate_config.sh.template

…

fate.texi

…

ffmpeg-bitstream-filters.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-codecs.texi

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

2013-08-28 09:35:20 -07:00

ffmpeg-devices.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-filters.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-formats.texi

doc/ffmpeg-formats: Add documentation for 2 parameters that have been missing

2013-09-22 15:11:00 -07:00

ffmpeg-protocols.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-resampler.texi

doc/ffmpeg-resampler: Try to document async

2013-01-06 17:47:49 +01:00

ffmpeg-scaler.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg-utils.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01:00

ffmpeg.texi

Merge commit '9920a8a83f578821e00212da6b79c8997a725fa8' into release/1.1

2014-12-21 04:04:48 +01:00

ffmpeg.txt

…

ffplay.texi

doc: remove inclusion of libav* documentation in tools

2012-12-20 23:48:23 +01:00

ffprobe.texi

doc: remove inclusion of libav* documentation in tools

2012-12-20 23:48:23 +01:00

ffprobe.xsd

ffprobe: show pkt_size in frame

2012-12-15 11:46:47 +01:00

ffserver.conf

…

ffserver.texi

doc/ffserver: fix a few typo.

2012-12-23 20:25:28 +01:00

filter_design.txt

lavfi: replace filter_samples by filter_frame

2012-11-28 16:43:34 +01:00

filters.texi

doc/filters: review introductory example and explanation

2013-08-28 09:35:20 -07:00

general.texi

doc/general: Make the license status of the Android libraries clearer

2013-08-28 09:35:18 -07:00

git-howto.texi

…

git-howto.txt

…

indevs.texi

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-19 08:11:11 +01:00

issue_tracker.txt

update all trac links to use the trac subdomain

2013-07-15 02:34:35 +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: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavformat.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libavutil.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libswresample.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

libswscale.texi

doc: extend "See Also" chapters in library manuals

2012-12-19 09:33:44 +01:00

Makefile

doc/Makefile: Fix make docclean

2013-02-25 05:52:17 -03:00

metadata.texi

…

mips.txt

…

multithreading.txt

…

muxers.texi

doc/muxers: Add AIFF doc

2013-08-28 09:35:19 -07:00

nut.texi

…

optimization.txt

…

outdevs.texi

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-19 08:11:11 +01:00

platform.texi

Merge commit 'd791e8c990a752435d993df01516ebe469d94535' into release/1.1

2014-04-21 14:20:35 +02:00

print_options.c

…

protocols.texi

doc: Fix some obsolete references to av* tools as ff* tools

2013-02-19 08:11:11 +01:00

rate_distortion.txt

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00

RELEASE_NOTES

doc/RELEASE_NOTES

2013-01-19 16:31:51 +01:00

snow.txt

…

soc.txt

…

swresample.txt

…

swscale.txt

…

syntax.texi

…

t2h.init

doc/default.css: use ffmpeg.org website CSS

2012-12-22 00:38:48 +01:00

tablegen.txt

…

texi2pod.pl

doc/texi2pod: fix @ref substitution rule, disallow "}" within the fields

2013-08-28 09:35:20 -07:00

viterbi.txt

miscellaneous typo fixes

2012-12-21 00:18:34 +01:00