* commit '7e201d57':
  jpeg2000: Validate block lengthinc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '278a923c':
  jpeg2000: Validate SIZ parsing

Conflicts:
	libavcodec/jpeg2000dec.c

This commit is not exactly merged due to bugs in it
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd3cb302b':
  jpeg2000: Validate SOT parsing

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

Add function avfilter_graph_parse_ptr() and favor it in place of
avfilter_graph_parse(), which will be restored with the old/Libav
signature at the next bump.

If HAVE_INCOMPATIBLE_LIBAV_API is enabled it will use the
Libav-compatible signature for avfilter_graph_parse().

At the next major bump the current implementation of
avfilter_graph_parse() should be dropped in favor of the Libav/old
implementation.

Should address trac ticket #2672.

"Fork" is an ambiguous term, since there may be more than one fork, also
"fork" could be confused with the corresponding function. Also it seems
important to point the name of the referenced fork in the symbol.

Note: the old --enable-incompatible-fork-abi command is retained for
compatibility, although it should be considered deprecated.

* commit '57bc64e2':
  jpeg2000: Use bytestream2
  jpeg2000: Clean up return paths and error messages
  jpeg2000: Define the maximum decomposition levels
  jpeg2000: Check code-block size
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This reverts commit 628ceac6.

The commit broke out of tree builds

* commit '1a3598aa':
  jpeg2000: Use bytestream2

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

* commit '5efadcb8':
  jpeg2000: Clean up return paths and error messages

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

* commit 'be327100':
  jpeg2000: Define the maximum decomposition levels

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

* commit 'fbcc03db':
  jpeg2000: Check code-block size

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

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Replace the inline awk script with a Perl script which tracks the
dependencies recursively.

This allows to correctly track dependencies for files including files
with a second level include (for example: ffmpeg-devices.texi ->
devices.texi -> outdevs.texi).

This also adds a dependency on perl for computing the dependencies, which
should not be a problem since perl is already required all the way for
building documentation.

* commit '5650e331':
  jpeg2000: Validate resolution levels

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

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

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

Currently we are using an array with a static data size.

Similar to a patch with the same purpose by Michael Niedermayer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Avoid some overreads.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Prevent a number of overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

And define the resolution levels according.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Nicolas Bertrand <nicoinattendu@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

There are 32 maximum decomposition levels, thus 33 resolution levels.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

I volunteer to maintain the delogo filter for at least the year to
come.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
patch/commit split by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Patch/commit split by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This should have no functional effect, but allows a cleaner diff when moving it
down
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This should fix hypothetical corner cases where it might have never been initialized before use
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The sample from ticket #2691 currently does not trigger "Consider increasing
the value for analzeduration and probesize" because the audio streams are
only added after calling estimate_timings(). Attached patch moves the message
below this function call.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The bug has been fixed in c8b920a9 by Loren Merritt
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  oggdec: do not fall back on binary search in the generic code.

Conflicts:
	libavformat/oggdec.c
	tests/ref/seek/lavf-ogg
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c8b920a9':
  lls/x86: use 3-operator vaddpd in ADDPD_MEM
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8bd90399':
  Revert "indeo5: reject negative motion vectors"

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

Binary search is already attempted in the format-specific seek function,
so the fallback is only reached if binary search failed already.

Fixes build with yasm-1.1
Signed-off-by: Anton Khirnov <anton@khirnov.net>