Skip to content

F
ffmpeg
Commit 45f2908d authored by Diego Biurrun's avatar Diego Biurrun
Browse files
Options

cosmetics: Rename ffsink to avsink.

parent 0184bbe2
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
avconv.c
View file @ 45f2908d
...@@ -550,7 +550,7 @@ static int configure_video_filters(InputStream *ist, OutputStream *ost) ...@@ -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;
FFSinkContext ffsink_ctx = { .pix_fmt = codec->pix_fmt }; AVSinkContext avsink_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) ...@@ -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, &ffsink, ret = avfilter_graph_create_filter(&ost->output_video_filter, &avsink,
"out", NULL, &ffsink_ctx, ost->graph); "out", NULL, &avsink_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;
......
avplay.c
View file @ 45f2908d
...@@ -1707,7 +1707,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c ...@@ -1707,7 +1707,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;
FFSinkContext ffsink_ctx = { .pix_fmt = PIX_FMT_YUV420P }; AVSinkContext avsink_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);
...@@ -1715,8 +1715,8 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c ...@@ -1715,8 +1715,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, &ffsink, "out", if ((ret = avfilter_graph_create_filter(&filt_out, &avsink, "out",
NULL, &ffsink_ctx, graph)) < 0) NULL, &avsink_ctx, graph)) < 0)
return ret; return ret;
if (vfilters) { if (vfilters) {
......
cmdutils.c
View file @ 45f2908d
...@@ -1031,34 +1031,34 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s, ...@@ -1031,34 +1031,34 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
#if CONFIG_AVFILTER #if CONFIG_AVFILTER
static int ffsink_init(AVFilterContext *ctx, const char *args, void *opaque) static int avsink_init(AVFilterContext *ctx, const char *args, void *opaque)
{ {
FFSinkContext *priv = ctx->priv; AVSinkContext *priv = ctx->priv;
if (!opaque) if (!opaque)
return AVERROR(EINVAL); return AVERROR(EINVAL);
*priv = *(FFSinkContext *)opaque; *priv = *(AVSinkContext *)opaque;
return 0; return 0;
} }
static void null_end_frame(AVFilterLink *inlink) { } static void null_end_frame(AVFilterLink *inlink) { }
static int ffsink_query_formats(AVFilterContext *ctx) static int avsink_query_formats(AVFilterContext *ctx)
{ {
FFSinkContext *priv = ctx->priv; AVSinkContext *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 ffsink = { AVFilter avsink = {
.name = "ffsink", .name = "avsink",
.priv_size = sizeof(FFSinkContext), .priv_size = sizeof(AVSinkContext),
.init = ffsink_init, .init = avsink_init,
.query_formats = ffsink_query_formats, .query_formats = avsink_query_formats,
.inputs = (AVFilterPad[]) {{ .name = "default", .inputs = (AVFilterPad[]) {{ .name = "default",
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
......
cmdutils.h
View file @ 45f2908d
...@@ -363,9 +363,9 @@ FILE *get_preset_file(char *filename, size_t filename_size, ...@@ -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;
} FFSinkContext; } AVSinkContext;
extern AVFilter ffsink; extern AVFilter avsink;
/** /**
* Extract a frame from sink. * Extract a frame from sink.
......
ffmpeg.c
View file @ 45f2908d
...@@ -338,7 +338,7 @@ static int configure_video_filters(InputStream *ist, OutputStream *ost) ...@@ -338,7 +338,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;
FFSinkContext ffsink_ctx = { .pix_fmt = codec->pix_fmt }; AVSinkContext avsink_ctx = { .pix_fmt = codec->pix_fmt };
AVRational sample_aspect_ratio; AVRational sample_aspect_ratio;
char args[255]; char args[255];
int ret; int ret;
...@@ -358,8 +358,8 @@ static int configure_video_filters(InputStream *ist, OutputStream *ost) ...@@ -358,8 +358,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, &ffsink, ret = avfilter_graph_create_filter(&ost->output_video_filter, &avsink,
"out", NULL, &ffsink_ctx, ost->graph); "out", NULL, &avsink_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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment