From abe655a4723290497fd727df61fab2840d84b643 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 19 Jan 2012 16:10:13 +0100
Subject: [PATCH] Drop unnecessary prefix from *sink* variable and struct
 names.

---
 avconv.c   |  6 +++---
 avplay.c   |  6 +++---
 cmdutils.c | 20 ++++++++++----------
 cmdutils.h |  4 ++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/avconv.c b/avconv.c
index 46f3090755..77d6648a53 100644
--- a/avconv.c
+++ b/avconv.c
@@ -550,7 +550,7 @@ static int configure_video_filters(InputStream *ist, OutputStream *ost)
     /** filter graph containing all filters including input & output */
     AVCodecContext *codec = ost->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;
     char args[255];
     int ret;
@@ -570,8 +570,8 @@ static int configure_video_filters(InputStream *ist, OutputStream *ost)
                                        "src", args, NULL, ost->graph);
     if (ret < 0)
         return ret;
-    ret = avfilter_graph_create_filter(&ost->output_video_filter, &avsink,
-                                       "out", NULL, &avsink_ctx, ost->graph);
+    ret = avfilter_graph_create_filter(&ost->output_video_filter, &sink,
+                                       "out", NULL, &sink_ctx, ost->graph);
     if (ret < 0)
         return ret;
     last_filter = ost->input_video_filter;
diff --git a/avplay.c b/avplay.c
index 27ac01ae33..19e2bdcc18 100644
--- a/avplay.c
+++ b/avplay.c
@@ -1706,7 +1706,7 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
 {
     char sws_flags_str[128];
     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;
     snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags);
     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",
                                             NULL, is, graph)) < 0)
         return ret;
-    if ((ret = avfilter_graph_create_filter(&filt_out, &avsink, "out",
-                                            NULL, &avsink_ctx, graph)) < 0)
+    if ((ret = avfilter_graph_create_filter(&filt_out, &sink, "out",
+                                            NULL, &sink_ctx, graph)) < 0)
         return ret;
 
     if (vfilters) {
diff --git a/cmdutils.c b/cmdutils.c
index a489a0f06e..0a87deedbb 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -1031,34 +1031,34 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
 
 #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)
         return AVERROR(EINVAL);
-    *priv = *(AVSinkContext *)opaque;
+    *priv = *(SinkContext *)opaque;
 
     return 0;
 }
 
 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 };
 
     avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts));
     return 0;
 }
 
-AVFilter avsink = {
-    .name      = "avsink",
-    .priv_size = sizeof(AVSinkContext),
-    .init      = avsink_init,
+AVFilter sink = {
+    .name      = "sink",
+    .priv_size = sizeof(SinkContext),
+    .init      = sink_init,
 
-    .query_formats = avsink_query_formats,
+    .query_formats = sink_query_formats,
 
     .inputs    = (AVFilterPad[]) {{ .name          = "default",
                                     .type          = AVMEDIA_TYPE_VIDEO,
diff --git a/cmdutils.h b/cmdutils.h
index eb96645eed..37fd4d3b67 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -363,9 +363,9 @@ FILE *get_preset_file(char *filename, size_t filename_size,
 
 typedef struct {
     enum PixelFormat pix_fmt;
-} AVSinkContext;
+} SinkContext;
 
-extern AVFilter avsink;
+extern AVFilter sink;
 
 /**
  * Extract a frame from sink.