Michael Niedermayer f31c36e552 Merge commit '705b748e8d8612385c96428ae36ed0d42a170d93' ...

* commit '705b748e8d8612385c96428ae36ed0d42a170d93':
  tls: Add support for listen mode

Conflicts:
	doc/protocols.texi
	libavformat/tls.c
	libavformat/version.h

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

2013-09-27 11:33:19 +02:00

..

doxy

…

examples

doc/examples: fix lib math dep for resampling_audio.

2013-09-04 15:49:18 +02:00

APIchanges

Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'

2013-09-22 11:42:03 +02:00

authors.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: improve libvo-aacenc doc

2013-09-15 11:35:32 +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

doc: Rename avtools-common-opts to fftools-common opts

2013-09-10 18:04:03 +02:00

ffmpeg.txt

…

ffplay.texi

doc: Rename avtools-common-opts to fftools-common opts

2013-09-10 18:04:03 +02:00

ffprobe.texi

ffprobe: add -read_intervals option

2013-09-19 10:10:30 +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: Rename avtools-common-opts to fftools-common opts

2013-09-10 18:04:03 +02:00

fftools-common-opts.texi

doc/fftools: rework some paragraph in the AVOptions chapter

2013-09-22 23:54:39 +02:00

filter_design.txt

doc/filter_design.txt: Fix duplicate words

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

filters.texi

doc/filters: fix an option name in the unsharp docs

2013-09-24 17:22:11 +02:00

formats.texi

lavf/options_table: improve option help text

2013-09-17 19:47:58 +02:00

general.texi

Merge commit 'c4bfa098072ba338d83555d6e2199f7e1e64ffff'

2013-09-19 12:36:11 +02:00

git-howto.texi

…

git-howto.txt

…

indevs.texi

…

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: add *install-doc that covers all documentation

2013-09-08 05:25:17 +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: itemize tee examples

2013-09-19 10:07:53 +02:00

nut.texi

…

optimization.txt

…

outdevs.texi

doc/outdevs: add sdl window_fullscreen option

2013-09-23 23:37:14 +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 '705b748e8d8612385c96428ae36ed0d42a170d93'

2013-09-27 11:33:19 +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

…