ffmpeg: get rid of the 'q' key schizofrenia

[ffmpeg] / libavfilter / vf_pixdesctest.c

diff --git a/libavfilter/vf_pixdesctest.c b/libavfilter/vf_pixdesctest.c
index c9397b52800c1968f69a896b583dc6b7f6ece99d..344f6648f1b0c6566debbe231668db1dba16e75a 100644 (file)
--- a/libavfilter/vf_pixdesctest.c
+++ b/libavfilter/vf_pixdesctest.c
@@ -1,19 +1,20 @@
 /*
- * This file is part of FFmpeg.
- * copyright (C) 2009 Stefano Sabatini
+ * Copyright (c) 2009 Stefano Sabatini
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * This file is part of Libav.
+ *
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -55,10 +56,10 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
     AVFilterBufferRef *outpicref;
     int i;
 
-    outlink->outpic = avfilter_get_video_buffer(outlink, AV_PERM_WRITE,
+    outlink->out_buf = avfilter_get_video_buffer(outlink, AV_PERM_WRITE,
                                                 outlink->w, outlink->h);
-    outpicref = outlink->outpic;
-    avfilter_copy_picref_props(outpicref, picref);
+    outpicref = outlink->out_buf;
+    avfilter_copy_buffer_ref_props(outpicref, picref);
 
     for (i = 0; i < 4; i++) {
         int h = outlink->h;
@@ -74,14 +75,14 @@ static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
     if (priv->pix_desc->flags & PIX_FMT_PAL)
         memcpy(outpicref->data[1], outpicref->data[1], 256*4);
 
-    avfilter_start_frame(outlink, avfilter_ref_pic(outpicref, ~0));
+    avfilter_start_frame(outlink, avfilter_ref_buffer(outpicref, ~0));
 }
 
 static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
 {
     PixdescTestContext *priv = inlink->dst->priv;
-    AVFilterBufferRef *inpic    = inlink->cur_pic;
-    AVFilterBufferRef *outpic   = inlink->dst->outputs[0]->outpic;
+    AVFilterBufferRef *inpic    = inlink->cur_buf;
+    AVFilterBufferRef *outpic   = inlink->dst->outputs[0]->out_buf;
     int i, c, w = inlink->w;
 
     for (c = 0; c < priv->pix_desc->nb_components; c++) {
@@ -109,7 +110,7 @@ static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir)
 
 AVFilter avfilter_vf_pixdesctest = {
     .name        = "pixdesctest",
-    .description = "Test pixel format definitions.",
+    .description = NULL_IF_CONFIG_SMALL("Test pixel format definitions."),
 
     .priv_size = sizeof(PixdescTestContext),
     .uninit    = uninit,