lavfi/field: switch to filter_frame API
lavf: add a concat demuxer.
x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'

* commit '9d5c62ba5b586c80af508b5914934b1c439f6652':
  lavu/opt: do not filter out the initial sign character except for flags
  eval: treat dB as decibels instead of decibytes
  float_dsp: add vector_dmul_scalar() to multiply a vector of doubles

Conflicts:
	libavutil/eval.c
	tests/ref/fate/eval

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/silencedetect: use eval builtin to parse dB.

Also update FATE test to use the dB form.
lavd/lavfi: fix float.h include.

float.h is a system header.
Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'

* commit 'b384e031daeb1ac612620985e3e5377bc587559c':
  lavfi: add volume filter

Conflicts:
	Changelog
	libavfilter/Makefile
	libavfilter/af_volume.c
	libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi: rename af_volume to af_volume_stefano

This matches the naming style of the new af_volume_justin filter.

Note, Yes i would too prefer having one filter instead of 2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
  pixdesc: fix yuva 10bit bit depth
  avconv: deprecate the -vol option
  x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
  x86: af_volume: add SSE2-optimized s16 volume scaling

Conflicts:
	ffmpeg.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: slice-mt: check master context for valid current_picture_ptr
  h264: slice-mt: get last_pic_dropable from master context
  alacenc: add support for multi-channel encoding

Conflicts:
	Changelog
	libavcodec/alac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
lavfi/deshake: switch to filter_frame.
lavfi/deshake: remove unecessary check before unref.
lavfi/deshake: switch inverted comments.
lavfi/deshake: small align prettifying.
huffyuv: make use of av_fast_padded_malloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Changelog: add an entry for deprecating the avconv -vol option
huffyuv: check for malloc failures

Signed-off-by: Paul B Mahol <onemda@gmail.com>
huffyuv: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
lavf/apedec: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
siff: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>