* commit '78670fbf':
  imgconvert: cosmetics: Reshuffle defines to reduce ifdeffery
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6869612f':
  arm: Macroize the test for 'setend' CPU instruction support

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

This fixes segfaults in gst-libav1.0 compiled against FFmpeg 2.3.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '16e66522':
  aarch64: NEON intrinsics dct_unquantize_h263.

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

* commit 'd45ebd48':
  configure: add support for neon intrinsics

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

* commit '389380c2':
  http: Do move the class instantiation in the conditional block
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '28df1d24':
  http: Provide an option to override the HTTP method
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bb0babd7':
  build: Support executable only ldflags

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

* commit 'b396bbad':
  configure: Do not add extralibs to avresample .pc file

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

* commit 'fc27e727':
  mpegts: do not export empty language tags
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Allows demuxing of iTunes files into adts while preserving gapless
metadata.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Intrinsics only used on aarch64 since the existing ARMv7 NEON asm
is slightly faster (Cortex-A9, gcc-4.8, micro-benchmarks and full
decoding time).
Signed-off-by: James Yu <james.yu@linaro.org>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>

* commit '4d2d0595':
  fate: Split audio- and video-related RealMedia targets

Conflicts:
	tests/fate/real.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '2ce53880':
  build: Conditionally compile all avcodec test programs

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

Remove a warning if https support is disabled.

Certain servers accept only PUT as valid method.

The options is useful to build position-independent executables on
hardened systems (e.g. Android L and Gentoo Hardened).

The library does not have external dependencies.

* commit '16b73280':
  build: Conditionally build and run DCT test program

Conflicts:
	libavcodec/Makefile
	libavcodec/dct-test.c
	tests/fate/libavcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'bd499d9a':
  build: Conditionally build and test iirfilter

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

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

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

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

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

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

fix these strange behavior:
-af flanger=delay=10 [OK]
-af flanger=delay=1e1 [OK]
-af flanger=delay=1e+1 [Error]
-af flanger=delay=0.1 [OK]
-af flanger=delay=1e-1 [Error]
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

They are unneeded and make adding elements slightly harder as they
would need to be constantly updated
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c3ec963d':
  mjpeg: return proper error code

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

* commit '81b9bf31':
  dct-test: Move arch-specific bits into arch-specific subdirectories

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

* commit 'a9f3f5fa':
  Revert "tiff: support reading gray+alpha at 8 bits"

Not merged, the pix fmt its not unknown
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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