Changeset 1caf614b in ffmpeg

Timestamp:

May 12, 2012, 10:13:49 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

f153dfc9

Parents:

ad6f006 (diff), 012f04a2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)