aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2013-07-26 10:20:47 +0200
committerMartin Storsjö <martin@martin.st>2013-07-26 19:51:04 +0300
commit779e6c2b985f2ad461a1ae704160822f97709ba7 (patch)
tree694eee571694938e8b1479072386ee51e818d692
parent03039f4c8cdb4f8e5dc69905f3d73e2a531157e8 (diff)
downloadffmpeg-779e6c2b985f2ad461a1ae704160822f97709ba7.tar.gz
lavfi: add attribute_align_arg to all public entry points
Previously it was partly only added to central functions called internally, however if GCC would inline these into the public fuction, the alignment attribute would not take effect. Instead, add it to all public entry points to avoid these problems. Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--libavfilter/buffersink.c8
-rw-r--r--libavfilter/buffersrc.c2
2 files changed, 5 insertions, 5 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c
index 94e7366955..a6352a73d0 100644
--- a/libavfilter/buffersink.c
+++ b/libavfilter/buffersink.c
@@ -146,8 +146,8 @@ static void compat_free_buffer(AVFilterBuffer *buf)
av_free(buf);
}
-static int attribute_align_arg compat_read(AVFilterContext *ctx,
- AVFilterBufferRef **pbuf, int nb_samples)
+static int compat_read(AVFilterContext *ctx,
+ AVFilterBufferRef **pbuf, int nb_samples)
{
AVFilterBufferRef *buf;
AVFrame *frame;
@@ -198,12 +198,12 @@ fail:
return ret;
}
-int av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf)
+int attribute_align_arg av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf)
{
return compat_read(ctx, buf, 0);
}
-int av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf,
+int attribute_align_arg av_buffersink_read_samples(AVFilterContext *ctx, AVFilterBufferRef **buf,
int nb_samples)
{
return compat_read(ctx, buf, nb_samples);
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c
index 5e982eab54..f11f835c2c 100644
--- a/libavfilter/buffersrc.c
+++ b/libavfilter/buffersrc.c
@@ -73,7 +73,7 @@ typedef struct {
return AVERROR(EINVAL);\
}
-int av_buffersrc_write_frame(AVFilterContext *ctx, const AVFrame *frame)
+int attribute_align_arg av_buffersrc_write_frame(AVFilterContext *ctx, const AVFrame *frame)
{
AVFrame *copy;
int ret = 0;