apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-31 20:42:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'

Browse Source 
* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
	libavfilter/buffersink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-07-28 11:26:57 +02:00
parent 63c0113588 966689442e
commit edab63a406
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libavfilter/buffersink.c
View File

@@ -56,7 +56,7 @@ typedef struct {
int sample_rates_size; int sample_rates_size;
/* only used for compat API */ /* 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 int64_t next_pts; ///< interpolating audio pts
} BufferSinkContext; } BufferSinkContext;
@@ -173,7 +173,6 @@ static int read_from_fifo(AVFilterContext *ctx, AVFrame *frame,
av_frame_free(&tmp); av_frame_free(&tmp);
return 0; return 0;
} }
int attribute_align_arg av_buffersink_get_samples(AVFilterContext *ctx, 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; return ret;
} }
AVBufferSinkParams *av_buffersink_params_alloc(void) AVBufferSinkParams *av_buffersink_params_alloc(void)
@@ -563,44 +561,44 @@ AVFilter avfilter_asink_ffabuffersink = {
static const AVFilterPad avfilter_vsink_buffer_inputs[] = { static const AVFilterPad avfilter_vsink_buffer_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame, .filter_frame = filter_frame,
}, },
{ NULL } { NULL }
}; };
AVFilter avfilter_vsink_buffer = { 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."), .description = NULL_IF_CONFIG_SMALL("Buffer video frames, and make them available to the end of the filter graph."),
.priv_size = sizeof(BufferSinkContext), .priv_size = sizeof(BufferSinkContext),
.priv_class = &buffersink_class, .priv_class = &buffersink_class,
.init_opaque = vsink_init, .init_opaque = vsink_init,
.uninit = uninit, .uninit = uninit,
.query_formats = vsink_query_formats, .query_formats = vsink_query_formats,
.inputs = avfilter_vsink_buffer_inputs, .inputs = avfilter_vsink_buffer_inputs,
.outputs = NULL, .outputs = NULL,
}; };
static const AVFilterPad avfilter_asink_abuffer_inputs[] = { static const AVFilterPad avfilter_asink_abuffer_inputs[] = {
{ {
.name = "default", .name = "default",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
.filter_frame = filter_frame, .filter_frame = filter_frame,
}, },
{ NULL } { NULL }
}; };
AVFilter avfilter_asink_abuffer = { 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."), .description = NULL_IF_CONFIG_SMALL("Buffer audio frames, and make them available to the end of the filter graph."),
.priv_class = &abuffersink_class, .priv_class = &abuffersink_class,
.priv_size = sizeof(BufferSinkContext), .priv_size = sizeof(BufferSinkContext),
.init_opaque = asink_init, .init_opaque = asink_init,
.uninit = uninit, .uninit = uninit,
.query_formats = asink_query_formats, .query_formats = asink_query_formats,
.inputs = avfilter_asink_abuffer_inputs, .inputs = avfilter_asink_abuffer_inputs,
.outputs = NULL, .outputs = NULL,
}; };