Browse Source

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.
Stefano Sabatini 13 years ago
parent
commit
4f7dfe12ea
10 changed files with 14 additions and 11 deletions
  1. 1 1
      avconv.c
  2. 3 0
      doc/APIchanges
  3. 2 2
      doc/filters.texi
  4. 1 1
      ffmpeg.c
  5. 1 1
      ffplay.c
  6. 1 1
      libavdevice/lavfi.c
  7. 3 3
      libavfilter/Makefile
  8. 1 1
      libavfilter/avfilter.h
  9. 0 0
      libavfilter/buffersink.h
  10. 1 1
      libavfilter/sink_buffer.c

+ 1 - 1
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
 

+ 3 - 0
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.
 

+ 2 - 2
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

+ 1 - 1
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
 

+ 1 - 1
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>

+ 1 - 1
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 {

+ 3 - 3
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
 
 

+ 1 - 1
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, \

+ 0 - 0
libavfilter/vsink_buffer.h → libavfilter/buffersink.h


+ 1 - 1
libavfilter/vsink_buffer.c → 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)
 {