Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'
* commit '966689442ed843019dc0722a49bfb0ac51755d19': buffersink: K&R formatting cosmetics Conflicts: libavfilter/buffersink.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
edab63a406
@ -173,7 +173,6 @@ static int read_from_fifo(AVFilterContext *ctx, AVFrame *frame,
|
||||
av_frame_free(&tmp);
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx,
|
||||
@ -218,7 +217,6 @@ int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx,
|
||||
}
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
|
||||
AVBufferSinkParams *av_buffersink_params_alloc(void)
|
||||
|
Loading…
x
Reference in New Issue
Block a user