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.
Unified · Split
| @@ -52,7 +52,7 @@ · 51 unmodified lines | |||
| 52 | # include "libavfilter/avcodec.h" | 52 | # include "libavfilter/avcodec.h" |
| 53 | # include "libavfilter/avfilter.h" | 53 | # include "libavfilter/avfilter.h" |
| 54 | # include "libavfilter/avfiltergraph.h" | 54 | # include "libavfilter/avfiltergraph.h" |
| 55 | # include "libavfilter/vsink_buffer.h" | 55 | # include "libavfilter/buffersink.h" |
| 56 | # include "libavfilter/vsrc_buffer.h" | 56 | # include "libavfilter/vsrc_buffer.h" |
| 57 | #endif | 57 | #endif |
| 58 | 58 | ||
| @@ -13,6 +13,9 @@ libavutil: 2011-04-18 · 12 unmodified lines | |||
| 13 | 13 | ||
| 14 | API changes, most recent first: | 14 | API changes, most recent first: |
| 15 | 15 | ||
| 16 | 2011-09-06 - xxxxxxx - lavfi 2.39.0 | ||
| 17 | Rename libavfilter/vsink_buffer.h to libavfilter/buffersink.h. | ||
| 18 | |||
| 16 | 2011-09-06 - xxxxxxx - lavfi 2.38.0 | 19 | 2011-09-06 - xxxxxxx - lavfi 2.38.0 |
| 17 | Unify video and audio sink API. | 20 | Unify video and audio sink API. |
| 18 | 21 | ||
| @@ -310,7 +310,7 @@ Below is a description of the currently available audio sinks. · 309 unmodified lines | |||
| 310 | Buffer audio frames, and make them available to the end of filter chain. | 310 | Buffer audio frames, and make them available to the end of filter chain. |
| 311 | 311 | ||
| 312 | This sink is mainly intended for programmatic use, in particular | 312 | This sink is mainly intended for programmatic use, in particular |
| 313 | through the interface defined in @file{libavfilter/vsink_buffer.h}. | 313 | through the interface defined in @file{libavfilter/buffersink.h}. |
| 314 | 314 | ||
| 315 | It requires a pointer to an AVABufferSinkContext structure, which | 315 | It requires a pointer to an AVABufferSinkContext structure, which |
| 316 | defines the incoming buffers' formats, to be passed as the opaque | 316 | 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 · 2091 unmodified lines | |||
| 2408 | graph. | 2408 | graph. |
| 2409 | 2409 | ||
| 2410 | This sink is mainly intended for a programmatic use, in particular | 2410 | This sink is mainly intended for a programmatic use, in particular |
| 2411 | through the interface defined in @file{libavfilter/vsink_buffer.h}. | 2411 | through the interface defined in @file{libavfilter/buffersink.h}. |
| 2412 | 2412 | ||
| 2413 | It does not require a string parameter in input, but you need to | 2413 | It does not require a string parameter in input, but you need to |
| 2414 | specify a pointer to a list of supported pixel formats terminated by | 2414 | specify a pointer to a list of supported pixel formats terminated by |
| @@ -52,7 +52,7 @@ · 51 unmodified lines | |||
| 52 | # include "libavfilter/avcodec.h" | 52 | # include "libavfilter/avcodec.h" |
| 53 | # include "libavfilter/avfilter.h" | 53 | # include "libavfilter/avfilter.h" |
| 54 | # include "libavfilter/avfiltergraph.h" | 54 | # include "libavfilter/avfiltergraph.h" |
| 55 | # include "libavfilter/vsink_buffer.h" | 55 | # include "libavfilter/buffersink.h" |
| 56 | # include "libavfilter/vsrc_buffer.h" | 56 | # include "libavfilter/vsrc_buffer.h" |
| 57 | #endif | 57 | #endif |
| 58 | 58 | ||
| @@ -43,7 +43,7 @@ · 42 unmodified lines | |||
| 43 | # include "libavfilter/avcodec.h" | 43 | # include "libavfilter/avcodec.h" |
| 44 | # include "libavfilter/avfilter.h" | 44 | # include "libavfilter/avfilter.h" |
| 45 | # include "libavfilter/avfiltergraph.h" | 45 | # include "libavfilter/avfiltergraph.h" |
| 46 | # include "libavfilter/vsink_buffer.h" | 46 | # include "libavfilter/buffersink.h" |
| 47 | #endif | 47 | #endif |
| 48 | 48 | ||
| 49 | #include <SDL.h> | 49 | #include <SDL.h> |
| @@ -34,7 +34,7 @@ · 33 unmodified lines | |||
| 34 | #include "libavutil/pixdesc.h" | 34 | #include "libavutil/pixdesc.h" |
| 35 | #include "libavfilter/avfilter.h" | 35 | #include "libavfilter/avfilter.h" |
| 36 | #include "libavfilter/avfiltergraph.h" | 36 | #include "libavfilter/avfiltergraph.h" |
| 37 | #include "libavfilter/vsink_buffer.h" | 37 | #include "libavfilter/buffersink.h" |
| 38 | #include "avdevice.h" | 38 | #include "avdevice.h" |
| 39 | 39 | ||
| 40 | typedef struct { | 40 | typedef struct { |
| @@ -8,7 +8,7 @@ FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec · 7 unmodified lines | |||
| 8 | FFLIBS-$(CONFIG_SCALE_FILTER) += swscale | 8 | FFLIBS-$(CONFIG_SCALE_FILTER) += swscale |
| 9 | FFLIBS-$(CONFIG_MP_FILTER) += avcodec | 9 | FFLIBS-$(CONFIG_MP_FILTER) += avcodec |
| 10 | 10 | ||
| 11 | HEADERS = avcodec.h avfilter.h avfiltergraph.h vsink_buffer.h vsrc_buffer.h | 11 | HEADERS = avcodec.h avfilter.h avfiltergraph.h buffersink.h vsrc_buffer.h |
| 12 | 12 | ||
| 13 | OBJS = allfilters.o \ | 13 | OBJS = allfilters.o \ |
| 14 | avfilter.o \ | 14 | avfilter.o \ |
| @@ -29,7 +29,7 @@ OBJS-$(CONFIG_ABUFFER_FILTER) += asrc_abuffer.o · 14 unmodified lines | |||
| 29 | OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o | 29 | OBJS-$(CONFIG_AMOVIE_FILTER) += src_movie.o |
| 30 | OBJS-$(CONFIG_ANULLSRC_FILTER) += asrc_anullsrc.o | 30 | OBJS-$(CONFIG_ANULLSRC_FILTER) += asrc_anullsrc.o |
| 31 | 31 | ||
| 32 | OBJS-$(CONFIG_ABUFFERSINK_FILTER) += vsink_buffer.o | 32 | OBJS-$(CONFIG_ABUFFERSINK_FILTER) += sink_buffer.o |
| 33 | OBJS-$(CONFIG_ANULLSINK_FILTER) += asink_anullsink.o | 33 | OBJS-$(CONFIG_ANULLSINK_FILTER) += asink_anullsink.o |
| 34 | 34 | ||
| 35 | OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o | 35 | OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o |
| @@ -82,7 +82,7 @@ OBJS-$(CONFIG_NULLSRC_FILTER) += vsrc_nullsrc.o · 46 unmodified lines | |||
| 82 | OBJS-$(CONFIG_RGBTESTSRC_FILTER) += vsrc_testsrc.o | 82 | OBJS-$(CONFIG_RGBTESTSRC_FILTER) += vsrc_testsrc.o |
| 83 | OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o | 83 | OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o |
| 84 | 84 | ||
| 85 | OBJS-$(CONFIG_BUFFERSINK_FILTER) += vsink_buffer.o | 85 | OBJS-$(CONFIG_BUFFERSINK_FILTER) += sink_buffer.o |
| 86 | OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o | 86 | OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o |
| 87 | 87 | ||
| 88 | 88 | ||
| @@ -29,7 +29,7 @@ · 28 unmodified lines | |||
| 29 | #include "libavutil/rational.h" | 29 | #include "libavutil/rational.h" |
| 30 | 30 | ||
| 31 | #define LIBAVFILTER_VERSION_MAJOR 2 | 31 | #define LIBAVFILTER_VERSION_MAJOR 2 |
| 32 | #define LIBAVFILTER_VERSION_MINOR 38 | 32 | #define LIBAVFILTER_VERSION_MINOR 39 |
| 33 | #define LIBAVFILTER_VERSION_MICRO 0 | 33 | #define LIBAVFILTER_VERSION_MICRO 0 |
| 34 | 34 | ||
| 35 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ | 35 | #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ |
File renamed without changes.
| @@ -25,7 +25,7 @@ · 24 unmodified lines | |||
| 25 | 25 | ||
| 26 | #include "libavutil/fifo.h" | 26 | #include "libavutil/fifo.h" |
| 27 | #include "avfilter.h" | 27 | #include "avfilter.h" |
| 28 | #include "vsink_buffer.h" | 28 | #include "buffersink.h" |
| 29 | 29 | ||
| 30 | AVBufferSinkParams *av_buffersink_params_alloc(void) | 30 | AVBufferSinkParams *av_buffersink_params_alloc(void) |
| 31 | { | 31 | { |