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.
Showing the changes to libavfilter (4 of 10 files). Show all
Unified · Split
| @@ -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 | { |