* commit '55519926':
  x86: Make function prototype comments in assembly code consistent

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

* commit 'edd1f833':
  x86: h264_idct_10_bit: Use proper type in function prototype comments
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '831a1180':
  Update dsputil- and SIMD-related comments to match reality more closely

Conflicts:
	libavcodec/x86/hpeldsp.asm
	libavutil/arm/float_dsp_init_arm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd1184b81':
  arm: dsputil: Add a bunch of missing #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '17608f6e':
  x86: Add some more missing headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fd9e2221':
  ppc: Add some missing headers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ed9625eb':
  dsputil: Move intreadwrite.h #include from header file to .c files
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9103185b':
  dsputil: Drop ff_check_alignment() function

Conflicts:
	libavcodec/dsputil.c

Not merged, as this check can safe the user and us some time
debuging misalignment issues.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '49676eb7':
  dsputil: Remove prototypes for nonexisting optimization functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '08dba0e1':
  x86: mpegvideoenc: Remove some remnants of the long-gone libmpeg2 IDCT

Not merged as the removed code is still used
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'b4dd424d':
  Remove all SPARC architecture optimizations

Conflicts:
	Makefile
	configure
	libavcodec/sparc/dsputil_vis.c
	libavcodec/sparc/dsputil_vis.h
	libavcodec/sparc/hpeldsp_vis.c
	libavcodec/sparc/simple_idct_vis.c
	libavcodec/sparc/vis.h
	libswscale/sparc/yuv2rgb_vis.c
	libswscale/swscale_internal.h

If someone wants to maintain these (or other) SPARC optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

* commit 'd6096a67':
  Remove all SH4 architecture optimizations

Conflicts:
	libavcodec/sh4/dsputil_sh4.c
	libavcodec/sh4/dsputil_sh4.h
	libavcodec/sh4/idct_sh4.c
	libavcodec/sh4/sh4.h

If someone wants to maintain these (or other) SH4 optimizations, please
contact me or ffmpeg-devel.
I am happy to revert this removial if theres someone considering to
maintain this code.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bbb64356':
  build: Record dependency of eatqi decoder on dsputil

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

* commit 'b5f112d8':
  configure: Add explicit dsputil dependency to mpegvideoenc

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

* commit 'cd832f03':
  ffv1: Drop bogus dependency on dsputil

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

* commit '0e29c5e1':
  build: Drop stray LPC dependency on dsputil

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

* commit '6cd76e54':
  build: Drop stray MJPEG encoder dependency on dsputil

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

* commit '9ecf1b62':
  build: Drop stray MLP decoder dependency on dsputil
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7d7be44f':
  build: Drop stray PNG decoder dependency on dsputil

Conflicts:
	configure

No change as the stray dependency was not in our configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '88b24064':
  build: Drop stray mpc8 decoder dependency on dsputil
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fb9a5bdc':
  Prepare for 11_alpha1 Release

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

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

* cehoyos/master:
  Fix hardware detection on aix.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  avconv: Match stream id

Conflicts:
	cmdutils.c
	doc/fftools-common-opts.texi

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

This helps grepping for functions, among other things.

The function is supposed to confirm that the compiler provided enough
alignment, but in practice it is only run in certain code paths and
insufficient alignment problems are restricted to legacy compilers.

SPARC is no longer being used in any multimedia-related fields and the
VIS optimizations only represent a maintenance burden.

SH4 has been end-of-lifed and no more test machines are available.

Previously, it was an implicit dependency through mpegvideo. Change
this, as implicit dependencies can cause all sorts of trouble.