Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 May 2011 11:00:31 +0000 (13:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 May 2011 11:00:31 +0000 (13:00 +0200)
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>
1  2 
cmdutils.h
libavcodec/g729dec.c
libavcodec/x86/fmtconvert_mmx.c

diff --cc cmdutils.h
Simple merge
Simple merge
Simple merge