Merge remote-tracking branch 'qatar/master'

This early morning merge should fix --disable-yasm

* qatar/master:
  Clean up #includes in cmdutils.h.
  g729: Merge g729.h into g729dec.c.
  10l: wrap float_interleave functions in HAVE_YASM.

Conflicts:
	libavcodec/g729.h

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

diff --cc cmdutils.h
Simple merge

diff --cc libavcodec/g729dec.c
Simple merge

diff --cc libavcodec/x86/fmtconvert_mmx.c
Simple merge