* commit 'a7d070ac':
  vf_fieldorder: avoid using AV_PIX_FMT_NB
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '862f33c1':
  vf_scale: use the pixfmt descriptor API

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

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

* commit '45fc73ed':
  vf_format: rework format list parsing

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

* commit '4d8c28de':
  imgutils: make systematic palette opaque.

Conflicts:
	libavutil/imgutils.c

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

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

this way we can do better tha a single fixed constant value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

That hardcodes the number of pixel formats into lavfi and will break
when a shared lavu is updated, adding new pixel formats.

Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.

Avoid using AV_PIX_FMT_NB, since that hardcodes the number of pixel
formats into lavfi and will break when a shared lavu is updated, adding
new pixel formats.

Signed-off-by: Lou Logan <lou@lrcd.com>

Signed-off-by: Lou Logan <lou@lrcd.com>

Signed-off-by: Lou Logan <lou@lrcd.com>

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

Fixes ticket #3648.

* cigaes/master:
  ffmpeg: use thread message API.
  lavu: add thread message API.
  compat/w32pthreads: add return value to pthread_cond_init().
Merged-by: Michael Niedermayer <michaelni@gmx.at>

In the configure script, add a pthread detection with
-ldl added to cflags, because uClibc requires -ldl to
link with native libpthread.

Tested with a custom ARM toolchain with uClibc 0.9.33.2 and gcc 4.6.3.
Signed-off-by: Neil Armstrong <narmstrong@neotion.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Some codecs still use mmx versions, so have them use the versions
with newer instruction sets.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Currently probesize is cliped at 1mb before being used for format detection.
Alternatively this cliping could be removed but this would then tie various
things like stream analysis to the file detection.
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>

This reverts commit ad733089.

breaks with --disable-yasm
revert requested by: Christophe Gisquet <christophe.gisquet@gmail.com>

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: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'e0d01dc7':
  smoothstream: check malloc calls
Merged-by: Michael Niedermayer <michaelni@gmx.at>

According to doc/errno.txt EOVERFLOW is not available everywhere. The
use of -1 is consistent with avcodec/srtenc.c.

Signed-off-by: Anton Khirnov <anton@khirnov.net>