[FFmpeg-devel] [PATCH] Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.

[Michael Niedermayer]

On Thu, Jan 17, 2013 at 08:24:49AM -0800, Ronald S. Bultje wrote:
> From: "Ronald S. Bultje" <rsbultje at gmail.com>
> 
> Conveniently (together with Justin's earlier patches), this makes
> our vorbis decoder entirely independent of dsputil.
> 
> (Untested on ppc/arm.)

i would be happy to test on arm but the patch doesnt apply:

Applying: Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
/home/michael/sb/home/michael/ffmpeg-git/ffmpeg/.git/rebase-apply/patch:196: trailing whitespace.

/home/michael/sb/home/michael/ffmpeg-git/ffmpeg/.git/rebase-apply/patch:549: trailing whitespace.
    void (*vorbis_inverse_coupling)(float *mag, float *ang, int blocksize);
error: patch failed: libavcodec/dsputil.c:36
error: libavcodec/dsputil.c: patch does not apply
error: patch failed: libavcodec/vorbisdec.c:29
error: libavcodec/vorbisdec.c: patch does not apply
error: patch failed: libavcodec/x86/dsputil_mmx.c:1833
error: libavcodec/x86/dsputil_mmx.c: patch does not apply
Patch failed at 0001 Move vorbis_inverse_coupling from dsputil to vorbisdspcontext.
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Many that live deserve death. And some that die deserve life. Can you give
it to them? Then do not be too eager to deal out death in judgement. For
even the very wise cannot see all ends. -- Gandalf
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20130117/2983ccf9/attachment.asc>