* commit 'f0389eb7':
  arm: fmtconvert: Split armv6 fmtconvert code off from vfp code
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7ffda66f':
  arm: float_dsp: Propagate cpu_flags to vfp initialization function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bd549cba':
  arm: dcadsp: Move synth filter initialization to dcadsp file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1909f6b1':
  swscale: cosmetics: Drop silly camelCase from swScale function pointer name

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

* commit '4e0799a4':
  swscale: Add some missing av_cold to arch-specific init functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3aa682f2':
  swscale: consistent names for arch-specific acceleration functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c2503d9c':
  swscale: ppc: Hide arch-specific initialization details

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

* commit '6af2c351':
  ppc: Add missing AltiVec cpuflag detection invocations
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'de81b6ae':
  ppc: fdct: Remove vim editor settings comment
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '70dd8892':
  mpegvideo: Replace arch initialization ifdeffery by standard conditionals
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cd529172':
  x86: rv40dsp: Move inline assembly optimizations out of YASM init section
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a5195839':
  swscale: x86: Hide arch-specific initialization details

Conflicts:
	libswscale/x86/Makefile
	libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a64f6a04':
  dsputil: x86: Hide arch-specific initialization details

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

* commit 'f61bece6':
  ppc: Add and use convenience macro to check for AltiVec availability

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

* commit '8410d6e9':
  avutil: Refactor CPU extension availability macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b78b10c4':
  avutil: Move internal CPU detection function declarations to private header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '91d4cfb8':
  apedec: do not buffer decoded samples over AVPackets

Conflicts:
	libavcodec/apedec.c

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

* commit '84146963':
  configure: x86: Fix handling of i686 and cpunop features
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6454c44f':
  rtmpproto: Fix limelight authentication with abbreviated app names
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'cb8f70c9':
  vf_fps: use double constants for default/min/max for start_time

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

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

Also give consistent names to init functions.

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

Also give consistent names to init functions.

Also give consistent names to init functions.