From 4f7dfe12eaffe2ec2399cc52ce9a8cb9f8fdb741 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Tue, 6 Sep 2011 18:37:44 +0200
Subject: [PATCH] lavfi: rename vsink_buffer.c to sink_buffer.c, and
vsink_buffer.h to buffersink.h
This is done in order to clarify the non-video-specific nature of the
buffersink code, as the result of the video/audio API unification of
the previous commit, and for improving overall consistency.
---
avconv.c | 2 +-
doc/APIchanges | 3 +++
doc/filters.texi | 4 ++--
ffmpeg.c | 2 +-
ffplay.c | 2 +-
libavdevice/lavfi.c | 2 +-
libavfilter/Makefile | 6 +++---
libavfilter/avfilter.h | 2 +-
libavfilter/{vsink_buffer.h => buffersink.h} | 0
libavfilter/{vsink_buffer.c => sink_buffer.c} | 2 +-
10 files changed, 14 insertions(+), 11 deletions(-)
rename libavfilter/{vsink_buffer.h => buffersink.h} (100%)
rename libavfilter/{vsink_buffer.c => sink_buffer.c} (99%)
diff --git a/avconv.c b/avconv.c
index 586c6fea18c..de3be4bef8f 100644
--- a/avconv.c
+++ b/avconv.c
@@ -52,7 +52,7 @@
# include "libavfilter/avcodec.h"
# include "libavfilter/avfilter.h"
# include "libavfilter/avfiltergraph.h"
-# include "libavfilter/vsink_buffer.h"
+# include "libavfilter/buffersink.h"
# include "libavfilter/vsrc_buffer.h"
#endif
diff --git a/doc/APIchanges b/doc/APIchanges
index dd79028a0a4..d6002940cf7 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -13,6 +13,9 @@ libavutil: 2011-04-18
API changes, most recent first:
+2011-09-06 - xxxxxxx - lavfi 2.39.0
+ Rename libavfilter/vsink_buffer.h to libavfilter/buffersink.h.
+
2011-09-06 - xxxxxxx - lavfi 2.38.0
Unify video and audio sink API.
diff --git a/doc/filters.texi b/doc/filters.texi
index 951cec78dbf..01e80549b9d 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -310,7 +310,7 @@ Below is a description of the currently available audio sinks.
Buffer audio frames, and make them available to the end of filter chain.
This sink is mainly intended for programmatic use, in particular
-through the interface defined in @file{libavfilter/vsink_buffer.h}.
+through the interface defined in @file{libavfilter/buffersink.h}.
It requires a pointer to an AVABufferSinkContext structure, which
defines the incoming buffers' formats, to be passed as the opaque
@@ -2408,7 +2408,7 @@ Buffer video frames, and make them available to the end of the filter
graph.
This sink is mainly intended for a programmatic use, in particular
-through the interface defined in @file{libavfilter/vsink_buffer.h}.
+through the interface defined in @file{libavfilter/buffersink.h}.
It does not require a string parameter in input, but you need to
specify a pointer to a list of supported pixel formats terminated by
diff --git a/ffmpeg.c b/ffmpeg.c
index 1d15e8cdecb..0d264403e61 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -52,7 +52,7 @@
# include "libavfilter/avcodec.h"
# include "libavfilter/avfilter.h"
# include "libavfilter/avfiltergraph.h"
-# include "libavfilter/vsink_buffer.h"
+# include "libavfilter/buffersink.h"
# include "libavfilter/vsrc_buffer.h"
#endif
diff --git a/ffplay.c b/ffplay.c
index d46001d34e6..8123f4375f6 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -43,7 +43,7 @@
# include "libavfilter/avcodec.h"
# include "libavfilter/avfilter.h"
# include "libavfilter/avfiltergraph.h"
-# include "libavfilter/vsink_buffer.h"
+# include "libavfilter/buffersink.h"
#endif
#include <SDL.h>
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c
index a1929ef0ec2..1c5a3aaee44 100644
--- a/libavdevice/lavfi.c
+++ b/libavdevice/lavfi.c
@@ -34,7 +34,7 @@
#include "libavutil/pixdesc.h"
#include "libavfilter/avfilter.h"
#include "libavfilter/avfiltergraph.h"
-#include "libavfilter/vsink_buffer.h"
+#include "libavfilter/buffersink.h"
#include "avdevice.h"
typedef struct {
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 0d791cb9629..840d53ce391 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -8,7 +8,7 @@ FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
FFLIBS-$(CONFIG_SCALE_FILTER) += swscale
FFLIBS-$(CONFIG_MP_FILTER) += avcodec
-HEADERS = avcodec.h avfilter.h avfiltergraph.h vsink_buffer.h vsrc_buffer.h
+HEADERS = avcodec.h avfilter.h avfiltergraph.h buffersink.h vsrc_buffer.h
OBJS = allfilters.o \
avfilter.o \
@@ -29,7 +29,7 @@ OBJS-$(CONFIG_ABUFFER_FILTER) += asrc_abuffer.o
OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o
OBJS-$(CONFIG_ANULLSRC_FILTER) += asrc_anullsrc.o
-OBJS-$(CONFIG_ABUFFERSINK_FILTER) += vsink_buffer.o
+OBJS-$(CONFIG_ABUFFERSINK_FILTER) += sink_buffer.o
OBJS-$(CONFIG_ANULLSINK_FILTER) += asink_anullsink.o
OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o
@@ -82,7 +82,7 @@ OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o
OBJS-$(CONFIG_RGBTESTSRC_FILTER) += vsrc_testsrc.o
OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o
-OBJS-$(CONFIG_BUFFERSINK_FILTER) += vsink_buffer.o
+OBJS-$(CONFIG_BUFFERSINK_FILTER) += sink_buffer.o
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 55cc57090ed..b0811acaf63 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -29,7 +29,7 @@
#include "libavutil/rational.h"
#define LIBAVFILTER_VERSION_MAJOR 2
-#define LIBAVFILTER_VERSION_MINOR 38
+#define LIBAVFILTER_VERSION_MINOR 39
#define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
diff --git a/libavfilter/vsink_buffer.h b/libavfilter/buffersink.h
similarity index 100%
rename from libavfilter/vsink_buffer.h
rename to libavfilter/buffersink.h
diff --git a/libavfilter/vsink_buffer.c b/libavfilter/sink_buffer.c
similarity index 99%
rename from libavfilter/vsink_buffer.c
rename to libavfilter/sink_buffer.c
index 4ae561c7a7e..6f7c542498e 100644
--- a/libavfilter/vsink_buffer.c
+++ b/libavfilter/sink_buffer.c
@@ -25,7 +25,7 @@
#include "libavutil/fifo.h"
#include "avfilter.h"
-#include "vsink_buffer.h"
+#include "buffersink.h"
AVBufferSinkParams *av_buffersink_params_alloc(void)
{
--
GitLab