x86: dsputil: Move ff_pd assembly constants to the only place they are used
x86: dsputil: Group all assembly constants together in constants.c
x86: dsputil: Move constant declarations into separate header
x86: dsputil: Move TRANSPOSE4 macro to the only place it is used
x86: vf_yadif: Remove stray dsputil_mmx #include
x86: dsputil: Remove unused argument from QPEL_OP macro
avfilter: Make enabled/disabled state available as a field of the AVFilterContext

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: use av_freep() for forced_kf_pts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: add -apad option which injects a apad filter only in the presence of video streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter: fix 2 warnings about discarding const

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

* commit '87614667606b42476f9017d79faf12b45a0bd77c':
  x86: dsputil: Move ff_pd assembly constants to the only place they are used

Conflicts:
	libavcodec/x86/lpc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'ed880050edf061b38d3e39e25657c59ad9108b27'

* commit 'ed880050edf061b38d3e39e25657c59ad9108b27':
  x86: dsputil: Group all assembly constants together in constants.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'

* commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57':
  x86: dsputil: Move constant declarations into separate header

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '3d40c1ee742db5f13ebcf53c2d1fa4bf4f39bcd2'

* commit '3d40c1ee742db5f13ebcf53c2d1fa4bf4f39bcd2':
  x86: dsputil: Move TRANSPOSE4 macro to the only place it is used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e'

* commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e':
  x86: vf_yadif: Remove stray dsputil_mmx #include

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

* qatar/master:
  x86: dsputil: Remove unused argument from QPEL_OP macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
fate: add test for lut filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
mmf: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
tools: Add adler32 checksum tool

This is about 6 times faster than md5sum on linux

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