* commit 'cebdedca':
  prores: decode alpha plane when it's present
  avfilter: check a malloc in avfilter_link().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bf5b5d2b':
  avfilter.c: cosmetics, reformat

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

* commit 'd79bd604':
  lavfi: factorize freeing a link

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

* commit '1dd35611':
  vf_format: do not use the AVFilterFormats internals.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'c5ab6088':
  af_aformat: cosmetics, fix indentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b01f6041':
  lavfi: rename AVFilterFormats.format_count to nb_formats

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

* commit 'e27f4b7c':
  doxy: don't sort struct members alphabetically
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '006ec648':
  lavr doxy: add version.h to the lavr group
  lavc doxy: add avcodec.h to the libavcodec group.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '40020e17':
  doxy: add a section about versioning.

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

* commit 'bc8c1cdc':
  lavfi doxy: add a page for lavfi.
  jpegls: check the scan offset

Conflicts:
	libavcodec/jpeglsdec.c
	libavfilter/avfilter.h
	libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4a4107b4':
  jpegls: factorize return paths
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a5a0ef5e':
  jpegls: return meaningful errors
  sparc: VIS mnemonics
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Where necessary use memcpy instead.
Thanks to Giorgio Vazzana [mywing81 gmail] for
spotting this loop as the cause for the bad
performance.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Additionally change sizeof(type) into sizeof(var)

Use the formats.h API instead.

This is more consistent with naming in the rest of Libav.

The declaration order is more meanigful in most cases.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Prevent an out of array bound write.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Currently, if VIS is enabled by configure, it will also be enabled at
run-time regardless of its support in the hardware. Thus, masking VIS
usage as it is done in vis.h by constructing binary instructions is
pointless. Using normal VIS mnemonics in inline assembly allows to take
advantage of automatic register allocation, gets rid of register
variables, which are unsupported by suncc for SPARC, and improves code
readability.
Signed-off-by: Diego Biurrun <diego@biurrun.de>

This fixes a valgrind warning about use of uninitialized stuff
(no actual such use occurs though)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This patch adds support for encoding VP8 files with alpha. The alpha channel
is encoded separately and the output is placed in AVPacket's side_data. The
muxer then muxes it into the BlockAdditional element of the matroska container.
More details on spec here: http://goo.gl/wCP1ySigned-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This patch adds support for muxing VP8 Alpha Files. The Alpha channel data is
placed in BlockAdditional element of the matroska container. More information
& exact spec on how this is implemented can be found here: http://goo.gl/wCP1ySigned-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>