diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 11:26:57 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 11:26:57 +0200 |
commit | edab63a4067ad4cd35d8d9259620983fc7c843f8 (patch) | |
tree | 1b3da86553d3db4ac1637cc84e657bc49fa03154 | |
parent | 63c0113588d61d5ed045e1937c473770453c53be (diff) | |
parent | 966689442ed843019dc0722a49bfb0ac51755d19 (diff) | |
download | ffmpeg-streaming-edab63a4067ad4cd35d8d9259620983fc7c843f8.zip ffmpeg-streaming-edab63a4067ad4cd35d8d9259620983fc7c843f8.tar.gz |
Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'
* commit '966689442ed843019dc0722a49bfb0ac51755d19':
buffersink: K&R formatting cosmetics
Conflicts:
libavfilter/buffersink.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavfilter/buffersink.c | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/libavfilter/buffersink.c b/libavfilter/buffersink.c index 8eb31ae..9c81d4d 100644 --- a/libavfilter/buffersink.c +++ b/libavfilter/buffersink.c @@ -56,7 +56,7 @@ typedef struct { int sample_rates_size; /* only used for compat API */ - AVAudioFifo *audio_fifo; ///< FIFO for audio samples + AVAudioFifo *audio_fifo; ///< FIFO for audio samples int64_t next_pts; ///< interpolating audio pts } BufferSinkContext; @@ -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) @@ -563,44 +561,44 @@ AVFilter avfilter_asink_ffabuffersink = { static const AVFilterPad avfilter_vsink_buffer_inputs[] = { { - .name = "default", - .type = AVMEDIA_TYPE_VIDEO, + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, .filter_frame = filter_frame, }, { NULL } }; AVFilter avfilter_vsink_buffer = { - .name = "buffersink", + .name = "buffersink", .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them available to the end of the filter graph."), - .priv_size = sizeof(BufferSinkContext), - .priv_class = &buffersink_class, + .priv_size = sizeof(BufferSinkContext), + .priv_class = &buffersink_class, .init_opaque = vsink_init, - .uninit = uninit, + .uninit = uninit, .query_formats = vsink_query_formats, - .inputs = avfilter_vsink_buffer_inputs, - .outputs = NULL, + .inputs = avfilter_vsink_buffer_inputs, + .outputs = NULL, }; static const AVFilterPad avfilter_asink_abuffer_inputs[] = { { - .name = "default", - .type = AVMEDIA_TYPE_AUDIO, - .filter_frame = filter_frame, + .name = "default", + .type = AVMEDIA_TYPE_AUDIO, + .filter_frame = filter_frame, }, { NULL } }; AVFilter avfilter_asink_abuffer = { - .name = "abuffersink", + .name = "abuffersink", .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."), - .priv_class = &abuffersink_class, - .priv_size = sizeof(BufferSinkContext), + .priv_class = &abuffersink_class, + .priv_size = sizeof(BufferSinkContext), .init_opaque = asink_init, - .uninit = uninit, + .uninit = uninit, .query_formats = asink_query_formats, - .inputs = avfilter_asink_abuffer_inputs, - .outputs = NULL, + .inputs = avfilter_asink_abuffer_inputs, + .outputs = NULL, }; |