[FFmpeg-cvslog] Merge commit 'fef906c77c09940a2fdad155b2adc05080e17eda'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 20 14:07:51 2013 +0100| [c62cb1112ffc32492c99aa1e94324fc6a951abe9] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c62cb1112ffc32492c99aa1e94324fc6a951abe9
---