RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 04:17:05 +00:00
Code Issues Projects Releases Wiki Activity

avfilter: deprecate avfilter_link_get_channels()

Browse Source 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-01-05 17:49:09 -03:00
parent 50b3cd22dd
commit b2c42fc6dc
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -15,6 +15,9 @@ libavutil: 2017-10-21
API changes, most recent first: API changes, most recent first:
2018-01-xx - xxxxxxx - lavfi 7.11.101 - avfilter.h
Deprecate avfilter_link_get_channels(). Use av_buffersink_get_channels().
2017-xx-xx - xxxxxxx - lavr 4.0.0 - avresample.h 2017-xx-xx - xxxxxxx - lavr 4.0.0 - avresample.h
Deprecate the entire library. Merged years ago to provide compatibility Deprecate the entire library. Merged years ago to provide compatibility
with Libav, it remained unmaintained by the FFmpeg project and duplicated with Libav, it remained unmaintained by the FFmpeg project and duplicated

2
libavfilter/avfilter.c
View File

@ -183,10 +183,12 @@ void avfilter_link_free(AVFilterLink **link)
av_freep(link); av_freep(link);
} }
#if FF_API_FILTER_GET_SET
int avfilter_link_get_channels(AVFilterLink *link) int avfilter_link_get_channels(AVFilterLink *link)
{ {
return link->channels; return link->channels;
} }
#endif
void ff_filter_set_ready(AVFilterContext *filter, unsigned priority) void ff_filter_set_ready(AVFilterContext *filter, unsigned priority)
{ {

4
libavfilter/avfilter.h
View File

@ -647,10 +647,14 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
*/ */
void avfilter_link_free(AVFilterLink **link); void avfilter_link_free(AVFilterLink **link);
#if FF_API_FILTER_GET_SET
/** /**
* Get the number of channels of a link. * Get the number of channels of a link.
* @deprecated Use av_buffersink_get_channels()
*/ */
attribute_deprecated
int avfilter_link_get_channels(AVFilterLink *link); int avfilter_link_get_channels(AVFilterLink *link);
#endif
/** /**
* Set the closed field of a link. * Set the closed field of a link.

5
libavfilter/version.h
View File

@ -31,7 +31,7 @@
#define LIBAVFILTER_VERSION_MAJOR 7 #define LIBAVFILTER_VERSION_MAJOR 7
#define LIBAVFILTER_VERSION_MINOR 11 #define LIBAVFILTER_VERSION_MINOR 11
#define LIBAVFILTER_VERSION_MICRO 100 #define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \
@ -55,5 +55,8 @@
#ifndef FF_API_LAVR_OPTS #ifndef FF_API_LAVR_OPTS
#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8) #define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8)
#endif #endif
#ifndef FF_API_FILTER_GET_SET
#define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8)
#endif
#endif /* AVFILTER_VERSION_H */ #endif /* AVFILTER_VERSION_H */