* commit '9f8cf50e':
  configure: Enable gas-preprocessor on all OSes but only if available

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

* commit 'f4312352':
  configure: Add probe identification of MS armasm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  lavf/img2dec: Initialize a stack variable.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2597a842':
  tiff: Improve grayscale support

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

* commit 'fb1ddcdc':
  avresample: Introduce AVFrame-based API

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

Fixes a valgrind warning about using unitialised memory.
Hopefully fixes crashes on several platforms reported through fate.

This makes the SPS parsing a little, but barely, safer.
Reviewed-by: Mickaël Raulet <mraulet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Also mark it as deprecated through its help text
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

They might be left uninitialized otherwise since 3ad04608.

Fixes ticket #3840.
Found-by: Carl Eugen Hoyos <ce@hoyos.ws>
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mplayer-specifc hacks should not be in our codebase. mplayer should fix
its own code. It is not our responsibility to work around their broken
code.

This reverts commit e8e57563.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

Only use PAL8 if palette is present, else use GRAY8 for pixfmt.

Instead of simulating a grayscale palette, use real grayscale pixels, if no
palette is actually defined.
Signed-off-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

It previously used the output, cropped size, causing overreads/writes.

Fixes ticket #3839.

This issue was introduced by d249e682, which is not part of any release
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavc doesn't export ff_raw_pix_fmt_tags[] anymore.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8c6f4302':
  mpeg: Suppress a compiler warning on callback type

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

* commit '9325d88e':
  lavc: remove obsolete and disabled avpriv functions

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

* commit '24c788f4':
  Remove obsolete FF_API_REFERENCE_DTS cruft.

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

It causes build failures in some cases and the functions are provided by
libavutil so the wraper should not be needed anymore

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

* commit '24e87f7f':
  Remove obsolete FF_API_PROBE_MIME cruft.

Conflicts:
	libavformat/avformat.h
	libavformat/format.c
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* cigaes/master:
  lavf/avio: do not include bprint.h.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '472f9ed3':
  Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.

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

this is needed / avoids some headaches  as one of their dependancies
(libavutil) was bumped
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>

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

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

Some applications still use this deprecated API
Its not nice to remove it when its still in use and as long as it doesnt
cause us any work to keep it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1985c2e7':
  Bump major versions of all libraries.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavdevice/version.h
	libavfilter/version.h
	libavformat/version.h
	libavutil/version.h
	libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

If people prefer we can also drop it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

avoids fate failure of join filter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This prevents a build failure when bumping.
the uses could easily be updated / removed, if people prefer.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit eedc3f36532e4c6de782fe1c2dc59d192418a8fc)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f4c444e1':
  Postpone API-incompatible changes until the next bump.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7acdd3a1':
  hevc_filter: avoid excessive calls to ff_hevc_get_ref_list()

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