Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 12 May 2012 22:13:49 +0000 (00:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 12 May 2012 22:13:49 +0000 (00:13 +0200)
commit1caf614bec297c7e6c5f115d3ba6663d0e682e8e
tree3a3a3d6b48cae7857d82d01d1a3cb7714d0355ac
parentad6f006081c04532335324a5a72d61f36ec386d7
parent012f04a277d21b2c5f28b3710fbe52321424946e
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: autoinsert resample filter when necessary.
  lavfi: add lavr-based audio resampling filter.
  x86: vc1: drop MMX loop filter implementation, which uses MMX2 instructions.

Conflicts:
configure
doc/filters.texi
libavcodec/x86/vc1dsp_mmx.c
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/avfiltergraph.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
doc/filters.texi
libavcodec/x86/vc1dsp_mmx.c
libavcodec/x86/vc1dsp_yasm.asm
libavfilter/Makefile
libavfilter/allfilters.c