Michael Niedermayer 3c7650a83d 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>

2011-05-19 13:00:31 +02:00

11 KiB

Raw Blame History

View Raw