ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop unnecessary prefix from *sink* variable and struct names.

Browse Source
This commit is contained in:
Diego Biurrun 2012-01-19 16:10:13 +01:00
parent 33ec9ef96d
commit abe655a472
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
avconv.c
View File

@ -550,7 +550,7 @@ static int configure_video_filters(InputStream *ist, OutputStream *ost)
/** filter graph containing all filters including input & output */ /** filter graph containing all filters including input & output */
AVCodecContext *codec = ost->st->codec; AVCodecContext *codec = ost->st->codec;
AVCodecContext *icodec = ist->st->codec; AVCodecContext *icodec = ist->st->codec;
AVSinkContext avsink_ctx = { .pix_fmt = codec->pix_fmt }; SinkContext sink_ctx = { .pix_fmt = codec->pix_fmt };
AVRational sample_aspect_ratio; AVRational sample_aspect_ratio;
char args[255]; char args[255];
int ret; int ret;
@ -570,8 +570,8 @@ static int configure_video_filters(InputStream *ist, OutputStream *ost)
"src", args, NULL, ost->graph); "src", args, NULL, ost->graph);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = avfilter_graph_create_filter(&ost->output_video_filter, &avsink, ret = avfilter_graph_create_filter(&ost->output_video_filter, &sink,
"out", NULL, &avsink_ctx, ost->graph); "out", NULL, &sink_ctx, ost->graph);
if (ret < 0) if (ret < 0)
return ret; return ret;
last_filter = ost->input_video_filter; last_filter = ost->input_video_filter;

6
avplay.c
View File

@ -1706,7 +1706,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
{ {
char sws_flags_str[128]; char sws_flags_str[128];
int ret; int ret;
AVSinkContext avsink_ctx = { .pix_fmt = PIX_FMT_YUV420P }; SinkContext sink_ctx = { .pix_fmt = PIX_FMT_YUV420P };
AVFilterContext *filt_src = NULL, *filt_out = NULL; AVFilterContext *filt_src = NULL, *filt_out = NULL;
snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags); snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags);
graph->scale_sws_opts = av_strdup(sws_flags_str); graph->scale_sws_opts = av_strdup(sws_flags_str);
@ -1714,8 +1714,8 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
if ((ret = avfilter_graph_create_filter(&filt_src, &input_filter, "src", if ((ret = avfilter_graph_create_filter(&filt_src, &input_filter, "src",
NULL, is, graph)) < 0) NULL, is, graph)) < 0)
return ret; return ret;
if ((ret = avfilter_graph_create_filter(&filt_out, &avsink, "out", if ((ret = avfilter_graph_create_filter(&filt_out, &sink, "out",
NULL, &avsink_ctx, graph)) < 0) NULL, &sink_ctx, graph)) < 0)
return ret; return ret;
if (vfilters) { if (vfilters) {

20
cmdutils.c
View File

@ -1031,34 +1031,34 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
static int avsink_init(AVFilterContext *ctx, const char *args, void *opaque) static int sink_init(AVFilterContext *ctx, const char *args, void *opaque)
{ {
AVSinkContext *priv = ctx->priv; SinkContext *priv = ctx->priv;
if (!opaque) if (!opaque)
return AVERROR(EINVAL); return AVERROR(EINVAL);
*priv = *(AVSinkContext *)opaque; *priv = *(SinkContext *)opaque;
return 0; return 0;
} }
static void null_end_frame(AVFilterLink *inlink) { } static void null_end_frame(AVFilterLink *inlink) { }
static int avsink_query_formats(AVFilterContext *ctx) static int sink_query_formats(AVFilterContext *ctx)
{ {
AVSinkContext *priv = ctx->priv; SinkContext *priv = ctx->priv;
enum PixelFormat pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE }; enum PixelFormat pix_fmts[] = { priv->pix_fmt, PIX_FMT_NONE };
avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts)); avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts));
return 0; return 0;
} }
AVFilter avsink = { AVFilter sink = {
.name = "avsink", .name = "sink",
.priv_size = sizeof(AVSinkContext), .priv_size = sizeof(SinkContext),
.init = avsink_init, .init = sink_init,
.query_formats = avsink_query_formats, .query_formats = sink_query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default", .inputs = (AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,

4
cmdutils.h
View File

@ -363,9 +363,9 @@ FILE *get_preset_file(char *filename, size_t filename_size,
typedef struct { typedef struct {
enum PixelFormat pix_fmt; enum PixelFormat pix_fmt;
} AVSinkContext; } SinkContext;
extern AVFilter avsink; extern AVFilter sink;
/** /**
* Extract a frame from sink. * Extract a frame from sink.