* qatar/master:
  avisynth: K&R formatting cosmetics

Conflicts:
	libavformat/avisynth.c

Nothing changed as the avisynth code has been rewritten to
support avi/avxsynth in ffmpeg.
And the new code should be free of formating problems.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '97b052e5':
  avisynth: Add missing #include for NULL_IF_CONFIG_SMALL
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'befe044b':
  avcodec: Stop exporting the removed audio_resample* symbols

Conflicts:
	libavcodec/libavcodec.v

Not merged as theres no pressing need to remove it now.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7f93a861':
  mpeg12enc: K&R formatting cosmetics

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

* 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: Diego Biurrun <diego@biurrun.de>

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.