diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-03-15 20:44:57 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 23:52:35 +0100 |
commit | d8dccf69ff2df7014a2bb8e0e17828a820f45b27 (patch) | |
tree | 4f0f2db72dd1aa529b807fe48b104b8139e12c0d | |
parent | 8d84e90c9bf1a06ce107aedbf6db651fa276d6e5 (diff) | |
download | ffmpeg-streaming-d8dccf69ff2df7014a2bb8e0e17828a820f45b27.zip ffmpeg-streaming-d8dccf69ff2df7014a2bb8e0e17828a820f45b27.tar.gz |
lavfi: let gcc realign the stack on public graph driving functions
The functions which actually drive the filter graph by pushing
frames through it need to ensure an aligned stack for SIMD functions.
This fixes a crash in YADIF filter when using a mingw build in a MSVC application.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavfilter/buffersink.c | 8 | ||||
-rw-r--r-- | libavfilter/buffersrc.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 8236f22..9bbc8d9 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -117,7 +117,7 @@ int av_buffersink_get_frame(AVFilterContext *ctx, AVFrame *frame) return av_buffersink_get_frame_flags(ctx, frame, 0); } -int av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flags) +int attribute_align_arg av_buffersink_get_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flags) { BufferSinkContext *buf = ctx->priv; AVFilterLink *inlink = ctx->inputs[0]; @@ -169,7 +169,7 @@ static int read_from_fifo(AVFilterContext *ctx, AVFrame *frame, } -int av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples) +int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, AVFrame *frame, int nb_samples) { BufferSinkContext *s = ctx->priv; AVFilterLink *link = ctx->inputs[0]; @@ -264,7 +264,7 @@ static void compat_free_buffer(AVFilterBuffer *buf) av_free(buf); } -static int compat_read(AVFilterContext *ctx, AVFilterBufferRef **pbuf, int nb_samples, int flags) +static int attribute_align_arg compat_read(AVFilterContext *ctx, AVFilterBufferRef **pbuf, int nb_samples, int flags) { AVFilterBufferRef *buf; AVFrame *frame; @@ -348,7 +348,7 @@ AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx) return ctx->inputs[0]->frame_rate; } -int av_buffersink_poll_frame(AVFilterContext *ctx) +int attribute_align_arg av_buffersink_poll_frame(AVFilterContext *ctx) { BufferSinkContext *buf = ctx->priv; AVFilterLink *inlink = ctx->inputs[0]; diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index 80fd2be..54a58fe 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -113,8 +113,8 @@ int av_buffersrc_add_frame_flags(AVFilterContext *ctx, AVFrame *frame, int flags return ret; } -static int av_buffersrc_add_frame_internal(AVFilterContext *ctx, - AVFrame *frame, int flags) +static int attribute_align_arg av_buffersrc_add_frame_internal(AVFilterContext *ctx, + AVFrame *frame, int flags) { BufferSourceContext *s = ctx->priv; AVFrame *copy; |