[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Thu May 19 13:11:00 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 19 13:00:31 2011 +0200| [3c7650a83d3bdca2fd680af722de344b092f65ec] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3c7650a83d3bdca2fd680af722de344b092f65ec
---





More information about the ffmpeg-cvslog mailing list