mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-05-30 20:27:47 +02:00
c62cb1112f
* commit 'fef906c77c09940a2fdad155b2adc05080e17eda': Move vorbis_inverse_coupling from dsputil to vorbisdspcontext. Conflicts: libavcodec/dsputil.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>