* qatar/master:
  Drop git- prefix from version labels
  Use the contents of RELEASE as version fallback instead of 'UNKNOWN'
  path64/open64: filter out unsupported flags
  Add Release Notes
  sipr: Drop unused DSPContext
  sipr: include string.h for mem*()
  sipr: Use memmove() to copy overlapped buffers.
  h264: drop some ugly casts

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

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

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

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

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

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

The list type was changed to int64_t to be able to hold
channel layouts.

avfilter_make_format_list() still takes a int32_t array and converts
it to int64_t. A new function, avfilter_make_format64_list, that
takes int64_t arrays has been added.

Replace sizeof((*avff)->formats)
with    sizeof(*(*avff)->formats)

as the size of the array element is given by the pointed element
rather than by its pointer.

In particular fix computation with the pending patch when
sizeof(int64_t) != sizeof(int64_t *).

Add a missing space between vsink_buffer.h and vsrc_buffer.h.
1000l.

Signed-off-by: Mans Rullgard <mans@mansr.com>

This makes binaries produced by source tarballs identify themselves with
the version number of the corresponding release series, unless overriden
by a 'VERSION' file.

These flags are accepted without error but produce an annoying
warning.  Filtering them out makes the build less noisy.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Also add the public interface libavfilter/vsink_buffer.h.

Avoid timescale conversion, simplify.

Add missing NULL check, and update documentation accordingly.

This filter is a simple wrapper around the LUT filter.

* qatar/master:
  lavf: prevent crash in av_open_input_file() if ap == NULL.
  more Changelog additions
  lavf: add a forgotten NULL check in convert_format_parameters().
  Fix build if yasm is not available.
  H.264: Add x86 assembly for 10-bit MC Chroma H.264 functions.

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

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

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

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

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

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

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

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

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

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

Needed for proper behaviour in our old API compatibility code.

Mainly ported from 8-bit H.264 MC Chroma.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>