[FFmpeg-devel] (no subject)

Ronald S. Bultje rsbultje at gmail.com
Wed May 13 21:15:35 CEST 2015


Hi,

On Wed, May 13, 2015 at 12:31 PM, Rainer Hochecker <fernetmenta at online.de>
wrote:

>
> From 85ea58a3129b1766d44bf1425c6656d7a4f5624c Mon Sep 17 00:00:00 2001
> From: Rainer Hochecker <fernetmenta at 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?

Ronald


More information about the ffmpeg-devel mailing list