Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: Match stream id

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

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

* cehoyos/master:
  Fix hardware detection on aix.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
dsputil: Remove disabled avg_no_rnd_qpel leftovers
dsputil.h: Clean up comments
dsputil.h: K&R formatting cosmetics
dsputil: K&R formatting cosmetics
dsputil: Merge variable declarations and initializations
dsputil: cosmetics: Lose camelCase on ff_cropTbl and ff_squareTbl names

Also switch from "tbl" to "tab" name suffixes.
rnd_avg.h: K&R formatting cosmetics
dsputil_template: K&R formatting cosmetics
dsputilenc_mmx: Merge two assignment blocks with identical conditions
dsputil_mmx: K&R formatting cosmetics
dsputilenc_mmx: K&R formatting cosmetics
x86: motion_est: K&R formatting cosmetics
x86: dsputil_x86.h: K&R formatting cosmetics
x86: dsputil_init: K&R formatting cosmetics
x86: dsputil_init: Drop some unnecessary parentheses
bfin: dsputil: Remove unused global variable
bfin: dsputil: Drop broken vsad bits

They were marked as broken and disabled in 2009 and will never get fixed.
bfin: hpeldsp: Drop broken put_pixels_*_xy2_nornd bits

They were marked as broken and disabled in 2009 and will never get fixed.