On Wed, May 13, 2015 at 03:15:35PM -0400, Ronald S. Bultje wrote:
> Hi,
>
> On Wed, May 13, 2015 at 12:31 PM, Rainer Hochecker <fernetme...@online.de>
> wrote:
>
> >
> > From 85ea58a3129b1766d44bf1425c6656d7a4f5624c Mon Sep 17 00:00:00 2001
> > From: Rainer Hochecker <fernetme...@online.de>
> > Date: Wed, 13 May 2015 18:21:38 +0200
> > Subject: [PATCH] swr: fix alignment issue caused by 8ch sse functions
> >
> > ---
> > libswresample/swresample.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/libswresample/swresample.c b/libswresample/swresample.c
> > index 6d13bc5..76b7a84 100644
> > --- a/libswresample/swresample.c
> > +++ b/libswresample/swresample.c
> > @@ -23,6 +23,7 @@
> > #include "audioconvert.h"
> > #include "libavutil/avassert.h"
> > #include "libavutil/channel_layout.h"
> > +#include "libavutil/internal.h"
> >
> > #include <float.h>
> >
> > @@ -663,8 +664,8 @@ int swr_is_initialized(struct SwrContext *s) {
> > return !!s->in_buffer.ch_count;
> > }
> >
> > -int swr_convert(struct SwrContext *s, uint8_t *out_arg[SWR_CH_MAX], int
> > out_count,
> > - const uint8_t *in_arg [SWR_CH_MAX], int
> > in_count){
> > +int attribute_align_arg swr_convert(struct SwrContext *s, uint8_t
> > *out_arg[SWR_CH_MAX], int out_count,
> > + const uint8_t *in_arg
> > [SWR_CH_MAX], int in_count){
> > AudioData * in= &s->in;
> > AudioData *out= &s->out;
>
>
> lgtm. Micheal, could you merge?merged thanks [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The worst form of inequality is to try to make unequal things equal. -- Aristotle
signature.asc
Description: Digital signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
