diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-13 00:13:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-13 00:13:49 +0200 |
| commit | 1caf614bec297c7e6c5f115d3ba6663d0e682e8e (patch) | |
| tree | 3a3a3d6b48cae7857d82d01d1a3cb7714d0355ac /libswresample/audioconvert.c | |
| parent | ad6f006081c04532335324a5a72d61f36ec386d7 (diff) | |
| parent | 012f04a277d21b2c5f28b3710fbe52321424946e (diff) | |
| download | ffmpeg-1caf614bec297c7e6c5f115d3ba6663d0e682e8e.tar.gz | |
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>
Diffstat (limited to 'libswresample/audioconvert.c')
0 files changed, 0 insertions, 0 deletions