Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'

[ffmpeg] / libavfilter / buffersink.h

diff --git a/libavfilter/buffersink.h b/libavfilter/buffersink.h
index 808c0c7aad4de5881c359f39d1241feb47c70683..a4019375d9e7846152964894d03cf28489d7fbfb 100644 (file)
--- a/libavfilter/buffersink.h
+++ b/libavfilter/buffersink.h
@@ -30,7 +30,7 @@
  * Struct to use for initializing a buffersink context.
  */
 typedef struct {
-    const enum PixelFormat *pixel_fmts; ///< list of allowed pixel formats, terminated by PIX_FMT_NONE
+    const enum AVPixelFormat *pixel_fmts; ///< list of allowed pixel formats, terminated by AV_PIX_FMT_NONE
 } AVBufferSinkParams;
 
 /**
@@ -110,7 +110,7 @@ AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx);
 /**
  * Get a buffer with filtered data from sink and put it in buf.
  *
- * @param sink pointer to a context of a buffersink or abuffersink AVFilter.
+ * @param ctx pointer to a context of a buffersink or abuffersink AVFilter.
  * @param buf pointer to the buffer will be written here if buf is non-NULL. buf
  *            must be freed by the caller using avfilter_unref_buffer().
  *            Buf may also be NULL to query whether a buffer is ready to be
@@ -119,14 +119,14 @@ AVRational av_buffersink_get_frame_rate(AVFilterContext *ctx);
  * @return >= 0 in case of success, a negative AVERROR code in case of
  *         failure.
  */
-int av_buffersink_read(AVFilterContext *sink, AVFilterBufferRef **buf);
+int av_buffersink_read(AVFilterContext *ctx, AVFilterBufferRef **buf);
 
 /**
  * Same as av_buffersink_read, but with the ability to specify the number of
  * samples read. This function is less efficient than av_buffersink_read(),
  * because it copies the data around.
  *
- * @param sink pointer to a context of the abuffersink AVFilter.
+ * @param ctx pointer to a context of the abuffersink AVFilter.
  * @param buf pointer to the buffer will be written here if buf is non-NULL. buf
  *            must be freed by the caller using avfilter_unref_buffer(). buf
  *            will contain exactly nb_samples audio samples, except at the end