Merge commit '3c370f5abc55739a261534b9f9bdc739cedbbbb9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Nov 2012 13:03:57 +0000 (14:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Nov 2012 13:10:05 +0000 (14:10 +0100)
commitb4d4e51027e0c55e35c081cb180396ab04099b2f
treee1335b4096cda0fd7fb738723719e09d08771f6c
parent2684d2e3ea8a1a2863ae9842d072341b44b09829
parent3c370f5abc55739a261534b9f9bdc739cedbbbb9
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@gmx.at>
configure
libavformat/riff.c
libavutil/x86/float_dsp.asm
libavutil/x86/float_dsp_init.c