* commit '8c345581':
  wavpack: return meaningful errors

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

* commit '0f689a3d':
  wavpack: K&R formatting cosmetics

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

Both strtoll and atoll have different names on MSVC, and strtoll has a
compatibility layer in place for this case.

Fixes compilation on MSVC.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes a crash with MPlayer.

Implementation of ftp protocol.

Fixes #1672
Signed-off-by: NLukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

And forward those that were already meaningful.

Fixes crash on SSE2
Fixes Ticket2443

Note, its possible to restructure the code to avoid the 16pixel limitation,
and such change is welcome!
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

It was previously declared as int.
Does not change fate results for x86.

Conflicts:

	libavcodec/ppc/fmtconvert_altivec.c
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NDiego Biurrun <diego@biurrun.de>

Signed-off-by: NCarl Eugen Hoyos <cehoyos@ag.or.at>

Signed-off-by: NJean First <jeanfirst@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

fixes remuxing of audio track from mov to aifc
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

* qatar/master:
  Escape 130 (RPL) decoder

Conflicts:
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/codec_desc.c
	libavcodec/escape130.c
	libavcodec/version.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

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

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

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

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

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

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

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

* commit 'c5ab6088':
  af_aformat: cosmetics, fix indentation
Merged-by: NMichael 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: NMichael Niedermayer <michaelni@gmx.at>

* commit 'e27f4b7c':
  doxy: don't sort struct members alphabetically
Merged-by: NMichael 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: NMichael Niedermayer <michaelni@gmx.at>

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

Conflicts:
	libavutil/avutil.h
Merged-by: NMichael 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: NMichael Niedermayer <michaelni@gmx.at>

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

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

Some fixes provided by Paul B Mahol <onemda@gmail.com>
and Michael Niedermayer <michaelni@gmx.at> and me.
Signed-off-by: NDiego Biurrun <diego@biurrun.de>
Signed-off-by: NKostya Shishkov <kostya.shishkov@gmail.com>

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

Fixes Ticket2490
Signed-off-by: NMichael 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: NReimar 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.