RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-05-05 12:48:25 +02:00
parent fdccb84e3b 20c86571cc
commit e7f8493fd8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavfilter/buffersink.c
View File

@ -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;