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

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

Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '08b94f16':
  configure: Don't pass MSVC compiler options -M[TD] to armasm
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cc1d8c54':
  avcodec: Postpone FF_IDCT_XVIDMMX removal until the next version bump
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #3750.

Fixes out of array access
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit 'd63443b9':
  lavc: drop the av_fast_{re,m}alloc compatibility wrappers

Conflicts:
	libavcodec/utils.c

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

* commit '8dca0877':
  mpegts: Return proper error code on invalid input data

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

* commit '59cc0812':
  Prepare for 11_alpha2 Release

Conflicts:
	RELEASE

Not merged, as our release numbers differ
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ab0742d2':
  configure: Suggest upgrading gas-preprocessor instead of just installing
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The -MD option (for enabling a dynamically linked crt) gets interpreted
as a cpp option for generating dependency information (into a file named
'-.d', when preprocessing to a pipe). We shouldn't be passing
any and all C compiler flags to armasm (which is a plain assembler,
only with cpp bolted on via gas-preprocessor), but these are the
main conflicting ones.
Signed-off-by: Martin Storsjö <martin@martin.st>

* 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>

They were only needed until the bump.

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: Diego Biurrun <diego@biurrun.de>

Older versions don't support all the features we test for now.
Signed-off-by: Martin Storsjö <martin@martin.st>

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>