Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 May 2012 21:40:58 +0000 (23:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 May 2012 21:42:17 +0000 (23:42 +0200)
commitea5dab58e074a91330e1f076a4cbe8fece889afe
treea94e47797fdd3adf9ac8b995cd562c2acf2fd2d3
parent841c1be57e59bc133cb615b48b0888ad9833156b
parentc89e428ed8c2c31396af2d18cab4342b7d82958f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dwt: check malloc calls
  ppc: Drop unused header regs.h
  af_resample: remove an extra space in the log output
  Convert vector_fmul range of functions to YASM and add AVX versions
  lavfi: add an audio split filter
  lavfi: rename vf_split.c to split.c

Conflicts:
doc/filters.texi
libavcodec/ppc/regs.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/f_split.c
libavfilter/split.c
libavfilter/version.h
libavfilter/vf_split.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
16 files changed:
Changelog
doc/filters.texi
libavcodec/aacsbrdata.h
libavcodec/aactab.c
libavcodec/aactab.h
libavcodec/dsputil.h
libavcodec/dwt.c
libavcodec/ra288.c
libavcodec/ra288.h
libavcodec/sbr.h
libavcodec/sinewin.h
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_yasm.asm
libavfilter/Makefile
libavfilter/split.c
libavfilter/version.h