Michael Niedermayer e7e0186eeb Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d' ...

* commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d':
  lavf: Add functions for SRTP decryption/encryption
  lavu: Add an API for calculating HMAC (RFC 2104)

Conflicts:
	doc/APIchanges
	libavutil/version.h

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

2013-01-15 15:57:33 +01:00

..

doxy

doc: support the new website layout

2012-10-08 11:22:42 +02:00

examples

doc/examples: fix assignments in if()

2013-01-14 05:05:20 +01:00

APIchanges

Merge commit 'ab2ad8bd56882c0ea160b154e8b836eb71abc49d'

2013-01-15 15:57:33 +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

…

build_system.txt

…

decoders.texi

doc/decoders: fix typo in "@Options"

2012-12-06 10:16:10 +01:00

default.css

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

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

demuxers.texi

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

developer.texi

dec/developer: Add Valgrind / Address Sanitizer to the patch checklist

2013-01-12 18:23:32 +01:00

doxy-wrapper.sh

doc: add apidoc target for doxygen API documentation

2012-11-02 18:28:56 +01:00

Doxyfile

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

encoders.texi

doc/encoders: clarify the direction of the quality setting parameters for libtheora

2012-12-27 15:47:15 +01:00

errno.txt

…

eval.texi

doc/eval: add missing documentation of functions

2012-08-22 01:03:48 +02:00

faq.texi

doc/faq: add -start_number example

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

fate_config.sh.template

doc/fate: Move fate config example into doc subdirectory

2012-09-29 19:27:01 +02:00

fate.texi

doc/fate: Move fate config example into doc subdirectory

2012-09-29 19:27:01 +02:00

ffmpeg-bitstream-filters.texi

doc: extend "See Also" chapters in component manuals

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

ffmpeg-codecs.texi

doc: extend "See Also" chapters in component manuals

2012-12-19 09:33:44 +01: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

lavf: clarify/extend documentation for AVFormatContext::analyzeduration

2013-01-13 15:09:09 +01:00

ffmpeg-protocols.texi

doc: extend "See Also" chapters in component manuals

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

ffmpeg-resampler.texi

doc: add noise shaping dithers

2013-01-09 23:28:08 +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

Fix color filter example.

2013-01-15 00:14:35 +01:00

ffmpeg.txt

…

ffplay.texi

ffplay: extend documentation for the -vf option

2013-01-13 16:03:13 +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

Merge commit 'bf5f46b4cc47b7a4568119f224057d4ff91b6cdd'

2012-11-16 13:07:10 +01:00

ffserver.texi

doc/ffserver: remove painfully outdated "What do I need?" section

2013-01-12 10:53:22 +01:00

filter_design.txt

lavfi: replace filter_samples by filter_frame

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

filters.texi

lavfi: add histeq filter

2013-01-05 10:25:32 +01:00

general.texi

Drop Snow codec

2013-01-06 16:30:02 +01:00

git-howto.texi

doc: git-howto: Leave reviewers time to react before pushing patches

2012-11-11 20:43:28 +01:00

git-howto.txt

…

indevs.texi

miscellaneous typo fixes

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

issue_tracker.txt

…

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: stop generating syntax.html.

2012-12-24 00:53:55 +01:00

metadata.texi

…

mips.txt

mips: Optimization of AC3 FP encoder and EAC3 FP decoder

2012-11-19 22:24:44 +01:00

multithreading.txt

…

muxers.texi

Add -movflags rtphint documentation.

2013-01-09 23:13:40 +01:00

nut.texi

Drop Snow codec

2013-01-06 16:30:02 +01:00

optimization.txt

Merge commit '652f5185945c8405fc57aed353286858df8d066f'

2012-10-31 14:02:35 +01:00

outdevs.texi

…

platform.texi

The c99-to-c89 binaries are now hosted on videolan.org.

2013-01-14 16:28:44 +01:00

print_options.c

…

protocols.texi

doc/protocols: improve wording of a sentence in http docs

2013-01-12 11:02:12 +01:00

rate_distortion.txt

miscellaneous typo fixes

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

RELEASE_NOTES

Merge commit 'b14e89b3c5e6d7f6401a2ff1e3d198fa902e988a'

2013-01-05 13:27:59 +01:00

snow.txt

Drop Snow codec

2013-01-06 16:30:02 +01:00

soc.txt

…

swresample.txt

doc/swresample.txt: fix typos

2012-10-02 09:43:27 +02:00

swscale.txt

x86: mmx2 ---> mmxext in comments and messages

2012-10-31 00:37:42 +01:00

syntax.texi

doc/syntax: add a "Quoting and escaping" section

2012-10-29 11:56:15 +01:00

t2h.init

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

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

tablegen.txt

…

texi2pod.pl

doc/texipod: add rule to correctly interpret @ref{ANCHOR,XREF,SECTION_NAME,...}

2013-01-13 15:09:08 +01:00

viterbi.txt

miscellaneous typo fixes

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