* commit '66f09105':
  mpeg12enc: drop forward declarations

Conflicts:
	libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c3e6e8f0':
  mem: Do not check unsigned values for negative size

Conflicts:
	libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b634b36f':
  mem: Improve documentation wording and spelling

Conflicts:
	libavutil/mem.c
	libavutil/mem.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket2812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes part of Ticket2812
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Untested due to lack of testcase
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Will be needed for jpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The filter does not work correctly most of time.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

There are better and actually maintained filters that have similar
functionality.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

Suggested-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  matroskaenc: Allow chapters to be written in trailer

Conflicts:
	libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Diego Biurrun <diego@biurrun.de>

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

untested due to lack of sample
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket2826
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes file from Ticket860
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

These prevent the rgb ljpeg code from being run on parameters that it doesnt
support. No testcase available but it seems possible to trigger these.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Sorry, I'm too lazy to fix the rest.

See previous commit.

The purpose of this commit is to make error management simpler and less
error prone, just like av_free() which is safe with NULL.

This ensures that no uninitialized bytes cause non-deterministic behavior.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This allows creation of frame accurate chapter marks from sources like
DVD and BD where the precise chapter location is not known until the
chapter mark has been reached during reading.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Prevent an invalid free in case of init failure.

Fix trac ticket #2930.

Some parts of the code have been known to react badly to
empty frames; they should not, but there is no need to
take risks.

The benchmark tests the speed of the following algorithms:
MD5, SHA-1, SHA-256, SHA-512, RIPEMD-160, AES-128.

It can optionally be built to perform the same benchmark on
other crypto libraries, for comparison purposes.
The supported libraries are:
- crypto:   OpenSSL's libcrypto;
- gcrypt:   GnuTLS's libgcrypt;
- tomcrypt: LibTomCrypt
To enable them, use this syntax:
make VERSUS=crypto+gcrypt+tomcrypt tools/crypto_bench
They do not need to have been enabled in configure.

It uses at least sin()

"into the doc/examples directory" vs "into doc/examples".

Currently all uses of the emu edge code as well as the code itself
assume int linesize
changing some but not changing all would introduce a security issue
once all use this typedef a simple search and replace can be
done to switch them all to ptrdiff_t
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  mpegvideo: Avoid 32-bit wrapping of linesize multiplications

This is not merged as its not correct for ffmpeg and would introduce a
security issue if merged as is.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	doc/filters.texi
Merged-by: Michael Niedermayer <michaelni@gmx.at>