[FFmpeg-cvslog] libavfilter: update doxy for filter_frame

Michael Niedermayer git at videolan.org
Wed Nov 28 16:49:07 CET 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 28 16:40:15 2012 +0100| [8227a0b7df7bd552430264899f9e3f95a128966e] | committer: Michael Niedermayer

libavfilter: update doxy for filter_frame

Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8227a0b7df7bd552430264899f9e3f95a128966e
---

 libavfilter/avfilter.h |   10 +++++-----
 libavfilter/internal.h |    8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index dbf3964..b456437 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -330,16 +330,16 @@ struct AVFilterPad {
     int (*draw_slice)(AVFilterLink *link, int y, int height, int slice_dir);
 
     /**
-     * Samples filtering callback. This is where a filter receives audio data
-     * and should do its processing.
+     * Filtering callback. This is where a filter receives a frame with
+     * audio/video data and should do its processing.
      *
-     * Input audio pads only.
+     * Input pads only.
      *
      * @return >= 0 on success, a negative AVERROR on error. This function
-     * must ensure that samplesref is properly unreferenced on error if it
+     * must ensure that frame is properly unreferenced on error if it
      * hasn't been passed on to another filter.
      */
-    int (*filter_frame)(AVFilterLink *link, AVFilterBufferRef *samplesref);
+    int (*filter_frame)(AVFilterLink *link, AVFilterBufferRef *frame);
 
     /**
      * Frame poll callback. This returns the number of immediately available
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 329ac49..d098156 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -138,16 +138,16 @@ struct AVFilterPad {
     int (*draw_slice)(AVFilterLink *link, int y, int height, int slice_dir);
 
     /**
-     * Samples filtering callback. This is where a filter receives audio data
-     * and should do its processing.
+     * Filtering callback. This is where a filter receives a frame with
+     * audio/video data and should do its processing.
      *
-     * Input audio pads only.
+     * Input pads only.
      *
      * @return >= 0 on success, a negative AVERROR on error. This function
      * must ensure that samplesref is properly unreferenced on error if it
      * hasn't been passed on to another filter.
      */
-    int (*filter_frame)(AVFilterLink *link, AVFilterBufferRef *samplesref);
+    int (*filter_frame)(AVFilterLink *link, AVFilterBufferRef *frame);
 
     /**
      * Frame poll callback. This returns the number of immediately available



More information about the ffmpeg-cvslog mailing list