diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:48:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:48:25 +0200 |
| commit | e7f8493fd8c9f1d0f7618dc068b5cb38e0395574 (patch) | |
| tree | 09864e1703143f5f1a25105fd4aca3ad485c3e52 | |
| parent | fdccb84e3b94d3710c6aa253ccc68ad01c17cb45 (diff) | |
| parent | 20c86571ccc71412781d4a4813e4693e0c42aec6 (diff) | |
| download | ffmpeg-e7f8493fd8c9f1d0f7618dc068b5cb38e0395574.tar.gz | |
Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'
* commit '20c86571ccc71412781d4a4813e4693e0c42aec6':
lavfi: let gcc realign the stack on public graph driving functions
Conflicts:
libavfilter/buffersink.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/buffersink.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 234027d2fa..bd07c58e40 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -176,7 +176,8 @@ static int read_from_fifo(AVFilterContext *ctx, AVFrame *frame, } -int attribute_align_arg 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]; @@ -271,7 +272,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, int flags) +static int attribute_align_arg compat_read(AVFilterContext *ctx, + AVFilterBufferRef **pbuf, int nb_samples, int flags) { AVFilterBufferRef *buf; AVFrame *frame; |