Michael Niedermayer c62cb1112f Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda' ...

* 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>

2013-01-20 14:13:16 +01:00

3.0 KiB

Raw Blame History

View Raw