wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "avfilter: deprecate avfilter_link_get_channels()"

Browse source 
This reverts commit 798dcf2432.

It was applied by accident before it could be reviewed.
This commit is contained in:
James Almer 2018-01-05 22:13:28 -03:00
parent 503164b54b
commit da5b05c833
4 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/APIchanges
View file

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

2
libavfilter/avfilter.c
View file

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

15
libavfilter/avfilter.h
View file

@ -448,11 +448,6 @@ struct AVFilterLink {
*/
AVRational time_base;
/**
* Number of channels.
*/
int channels;
/*****************************************************************
* All fields below this line are not part of the public API. They
* may not be used outside of libavfilter and can be changed and
@ -556,6 +551,11 @@ struct AVFilterLink {
*/
int max_samples;
/**
* Number of channels.
*/
int channels;
/**
* Link processing flags.
*/
@ -647,15 +647,10 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad,
*/
void avfilter_link_free(AVFilterLink **link);
#if FF_API_FILTER_GET_SET
/**
* Get the number of channels of a link.
* @deprecated This accessor used to be provided for ABI compatibility, and
* does not need to be used anymore.
*/
attribute_deprecated
int avfilter_link_get_channels(AVFilterLink *link);
#endif
/**
* 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_MINOR 11
#define LIBAVFILTER_VERSION_MICRO 101
#define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
@ -55,8 +55,5 @@
#ifndef FF_API_LAVR_OPTS
#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8)
#endif
#ifndef FF_API_FILTER_GET_SET
#define FF_API_FILTER_GET_SET (LIBAVFILTER_VERSION_MAJOR < 8)
#endif
#endif /* AVFILTER_VERSION_H */