cosmetics: Rename ffsink to avsink.

zhengxj91 · Jan 18, 2012 · 45f2908 · 45f2908
1 parent 0184bbe
commit 45f2908
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git 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;
- FFSinkContext ffsink_ctx = { .pix_fmt = codec->pix_fmt };
+ AVSinkContext avsink_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, &ffsink,
- "out", NULL, &ffsink_ctx, ost->graph);
+ ret = avfilter_graph_create_filter(&ost->output_video_filter, &avsink,
+ "out", NULL, &avsink_ctx, ost->graph);
  if (ret < 0)
  return ret;
  last_filter = ost->input_video_filter;

diff --git a/avplay.c b/avplay.c
@@ -1707,16 +1707,16 @@ static int configure_video_filters(AVFilterGraph *graph, VideoState *is, const c
 {
  char sws_flags_str[128];
  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;
  snprintf(sws_flags_str, sizeof(sws_flags_str), "flags=%d", sws_flags);
  graph->scale_sws_opts = av_strdup(sws_flags_str);
 
  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, &ffsink, "out",
- NULL, &ffsink_ctx, graph)) < 0)
+ if ((ret = avfilter_graph_create_filter(&filt_out, &avsink, "out",
+ NULL, &avsink_ctx, graph)) < 0)
  return ret;
 
  if (vfilters) {

diff --git a/cmdutils.c b/cmdutils.c
@@ -1031,34 +1031,34 @@ AVDictionary **setup_find_stream_info_opts(AVFormatContext *s,
 
 #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)
  return AVERROR(EINVAL);
- *priv = *(FFSinkContext *)opaque;
+ *priv = *(AVSinkContext *)opaque;
 
  return 0;
 }
 
 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 };
 
  avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts));
  return 0;
 }
 
-AVFilter ffsink = {
- .name = "ffsink",
- .priv_size = sizeof(FFSinkContext),
- .init = ffsink_init,
+AVFilter avsink = {
+ .name = "avsink",
+ .priv_size = sizeof(AVSinkContext),
+ .init = avsink_init,
 
- .query_formats = ffsink_query_formats,
+ .query_formats = avsink_query_formats,
 
  .inputs = (AVFilterPad[]) {{ .name = "default",
  .type = AVMEDIA_TYPE_VIDEO,

diff --git 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;
-} FFSinkContext;
+} AVSinkContext;
 
-extern AVFilter ffsink;
+extern AVFilter avsink;
 
 /**
  * Extract a frame from sink.

diff --git a/ffmpeg.c b/ffmpeg.c
@@ -338,7 +338,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;
- FFSinkContext ffsink_ctx = { .pix_fmt = codec->pix_fmt };
+ AVSinkContext avsink_ctx = { .pix_fmt = codec->pix_fmt };
  AVRational sample_aspect_ratio;
  char args[255];
  int ret;
@@ -358,8 +358,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, &ffsink,
- "out", NULL, &ffsink_ctx, ost->graph);
+ ret = avfilter_graph_create_filter(&ost->output_video_filter, &avsink,
+ "out", NULL, &avsink_ctx, ost->graph);
  if (ret < 0)
  return ret;
  last_filter = ost->input_video_filter;