[FFmpeg-cvslog] Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Nov 27 14:03:57 2012 +0100| [b4d4e51027e0c55e35c081cb180396ab04099b2f] | committer: Michael Niedermayer

Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'

* commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9':
  riff: only warn on a bad INFO chunk code size instead of failing
  configure: Add separate list for libraries and use where appropriate
  x86: float_dsp: add SSE version of vector_fmul_scalar()

Conflicts:
	configure
	libavformat/riff.c
	libavutil/x86/float_dsp.asm

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

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