Michael Niedermayer 35307df53c Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748' ...

* commit '0ebfdae099d2749240b6a565abcdf0bf62589748':
  doc: Describe TB option of setpts filter

Conflicts:
	doc/filters.texi

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

2013-09-04 14:06:46 +02:00

..

doxy

…

examples

doc/examples/filtering_audio: make const arrays also static

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

APIchanges

doc/APIchanges: add missing entry for av_format_probe_score() function addition

2013-08-29 00:10:34 +02:00

authors.texi

…

avtools-common-opts.texi

…

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

lavc: add teletext decoder using libzvbi

2013-09-02 01:19:52 +02:00

default.css

…

demuxers.texi

Merge remote-tracking branch 'qatar/master'

2013-08-28 13:03:09 +02:00

developer.texi

Merge remote-tracking branch 'qatar/master'

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

devices.texi

…

doxy-wrapper.sh

…

Doxyfile

Fix wrong use of "an" in some comments.

2013-08-12 03:27:26 +02:00

encoders.texi

doc/encoders: reformat and add some clarification in libtwolame doc

2013-08-30 11:37:07 +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

Fix wrong use of "an" in some comments.

2013-08-12 03:27:26 +02:00

ffmpeg-scaler.texi

Fix wrong use of "an" in some comments.

2013-08-12 03:27:26 +02:00

ffmpeg-utils.texi

…

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

Fix wrong use of "an" in some comments.

2013-08-12 03:27:26 +02:00

ffprobe.xsd

ffprobe: show probe_score in the format section

2013-09-01 11:34:18 +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

doc/filter_design.txt: Fix duplicate words

2013-08-12 19:40:29 +02:00

filters.texi

Merge commit '0ebfdae099d2749240b6a565abcdf0bf62589748'

2013-09-04 14:06:46 +02:00

formats.texi

doc/formats: remove probe_score entry, since it's not an option

2013-08-29 00:08:27 +02:00

general.texi

Merge commit '7df9e693a34c84c698da60426c78140c950f95ed'

2013-09-03 15:05:18 +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

…

libswresample.texi

Fix wrong use of "an" in some comments.

2013-08-12 03:27:26 +02:00

libswscale.texi

…

Makefile

doc: fix insane hard texi2html dependancy

2013-09-01 20:02:52 +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

lavf/image2: extend start_number range to accept zero

2013-08-22 14:26:23 +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

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

protocols.texi

Merge commit 'd175a5730b42166704b7262b33f4b780d9d92f60'

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

rate_distortion.txt

…

RELEASE_NOTES

Revert "doc/RELEASE_NOTES: add a note about AVISynth"

2013-08-19 12:39:28 +02:00

resampler.texi

doc: add "rematrix_maxval"

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

scaler.texi

…

snow.txt

doc/snow: add gray/alpha/gbr

2013-08-29 22:52:04 +02:00

soc.txt

…

swresample.txt

…

swscale.txt

…

t2h.init

…

tablegen.txt

…

texi2pod.pl

…

utils.texi

…

viterbi.txt

…