* commit 'bce70f81':
  configure: make avconv select (a)trim filters

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

* commit '481575d2':
  avconv: remove -deinterlace

Conflicts:
	Changelog
	doc/ffmpeg.texi
	ffmpeg.c
	ffmpeg_opt.c

The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a97d8cc1':
  indeo3: use unaligned reads on reference blocks.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '70f96615':
  jpeg2000dec: initialize static data just once
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '45a1694f':
  jpeg2000dec: cleanup properly after decoding errors

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

MSVC complains about the 32bits addressing, while mingw/gcc does not.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also extend documentation accordingly.

In particular, mention the fact that the amortized element addition cost
is constant.

Fixes a few green artifacts at the top
Fixes rest of Ticket 2535
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* cigaes/master:
  lavfi: add comments to explain the negotiation loop.
  lavfi: fix filter format negotiation loop.
  ffmpeg: move a local variable definition later.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes array overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

query_formats() returning EAGAIN is not considered a progress
in the format negotiation.

If the filter returns EAGAIN but did set some of its formats
lists, it could be considered a partial success and counted
as progress in the negotiation. Not counting it is not a
problem because it currently only happens in the first round,
where there will always be some progress on the other filters.

Fix a segfault when using the -map option without input files.

This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Padding data is not supposed to be copied.

* cehoyos/master:
  Support decoding of Lagarith frame type FRAME_SOLID_COLOR.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Gunther Piez <gupiez@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This makes the code also more robust, not having a hard-coded
table that can become (and was) incomplete.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

They are now used for -ss/-t

It is incompatible with refcounted frames and since it's been deprecated
for a long time now, fixing it is not worth the effort.

They are not guaranteed to be aligned.
Fixes Bug 503.

CC:libav-stable@libav.org

Fixes bug 459.

* qatar/master:
  fate-jpeg2000-dcinema: force output to xyz12le

Conflicts:
	tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5f87c277':
  vf_scale: add endianness conversion pixel format in query_formats

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

* commit '9cfa21c8':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Conflicts:
	libswscale/swscale_unscaled.c
	libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c1eb3e7f':
  swscale: add support for endianness only conversion

Conflicts:
	libswscale/utils.c
	libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '74652af8':
  pixdesc: add function to return pixel format with swapped endiannes

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

This is the first 2 MB of the official test7.mkv.
That length seems to be enough to detect the bugs
we had in our code so far.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Fixes playback of test7.mkv validation test file.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

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