mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-22 23:33:07 +00:00
lavfi: drop deprecated and disabled packing API
It was deprecated and removed after the recent 2->3 major bump.
This commit is contained in:
parent
8dd0e87d7b
commit
720ec62012
@ -113,9 +113,6 @@ typedef struct AVFilterBufferRefAudioProps {
|
||||
uint64_t channel_layout; ///< channel layout of audio buffer
|
||||
int nb_samples; ///< number of audio samples per channel
|
||||
int sample_rate; ///< audio buffer sample rate
|
||||
#if FF_API_PACKING
|
||||
int planar; ///< audio buffer - planar or packed
|
||||
#endif
|
||||
} AVFilterBufferRefAudioProps;
|
||||
|
||||
/**
|
||||
@ -299,13 +296,6 @@ AVFilterFormats *avfilter_make_all_formats(enum AVMediaType type);
|
||||
*/
|
||||
extern const int64_t avfilter_all_channel_layouts[];
|
||||
|
||||
#if FF_API_PACKING
|
||||
/**
|
||||
* Return a list of all audio packing formats.
|
||||
*/
|
||||
AVFilterFormats *avfilter_make_all_packing_formats(void);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Return a format list which contains the intersection of the formats of
|
||||
* a and b. Also, all the references of a, all the references of b, and
|
||||
@ -350,10 +340,6 @@ attribute_deprecated
|
||||
void avfilter_set_common_sample_formats(AVFilterContext *ctx, AVFilterFormats *formats);
|
||||
attribute_deprecated
|
||||
void avfilter_set_common_channel_layouts(AVFilterContext *ctx, AVFilterFormats *formats);
|
||||
#if FF_API_PACKING
|
||||
attribute_deprecated
|
||||
void avfilter_set_common_packing_formats(AVFilterContext *ctx, AVFilterFormats *formats);
|
||||
#endif
|
||||
|
||||
/**
|
||||
* @}
|
||||
@ -656,13 +642,6 @@ struct AVFilterContext {
|
||||
struct AVFilterCommand *command_queue;
|
||||
};
|
||||
|
||||
#if FF_API_PACKING
|
||||
enum AVFilterPacking {
|
||||
AVFILTER_PACKED = 0,
|
||||
AVFILTER_PLANAR,
|
||||
};
|
||||
#endif
|
||||
|
||||
/**
|
||||
* A link between two filters. This contains pointers to the source and
|
||||
* destination filters between which this link exists, and the indexes of
|
||||
@ -697,10 +676,6 @@ struct AVFilterLink {
|
||||
#else
|
||||
int sample_rate; ///< samples per second
|
||||
#endif
|
||||
#if FF_API_PACKING
|
||||
int planar; ///< agreed upon packing mode of audio buffers. true if planar.
|
||||
#endif
|
||||
|
||||
int format; ///< agreed upon media format
|
||||
|
||||
/**
|
||||
@ -713,11 +688,6 @@ struct AVFilterLink {
|
||||
AVFilterFormats *in_formats;
|
||||
AVFilterFormats *out_formats;
|
||||
|
||||
#if FF_API_PACKING
|
||||
AVFilterFormats *in_packing;
|
||||
AVFilterFormats *out_packing;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* The buffer reference currently being sent across the link by the source
|
||||
* filter. This is used internally by the filter system to allow
|
||||
|
@ -46,9 +46,6 @@ AVBufferSinkParams *av_buffersink_params_alloc(void);
|
||||
typedef struct {
|
||||
const enum AVSampleFormat *sample_fmts; ///< list of allowed sample formats, terminated by AV_SAMPLE_FMT_NONE
|
||||
const int64_t *channel_layouts; ///< list of allowed channel layouts, terminated by -1
|
||||
#if FF_API_PACKING
|
||||
const int *packing_fmts; ///< list of allowed packing formats
|
||||
#endif
|
||||
} AVABufferSinkParams;
|
||||
|
||||
/**
|
||||
|
@ -46,12 +46,3 @@ static void set_common_formats(AVFilterContext *ctx, AVFilterFormats *fmts,
|
||||
av_free(fmts);
|
||||
}
|
||||
}
|
||||
|
||||
#if FF_API_PACKING
|
||||
void avfilter_set_common_packing_formats(AVFilterContext *ctx, AVFilterFormats *formats)
|
||||
{
|
||||
set_common_formats(ctx, formats, AVMEDIA_TYPE_AUDIO,
|
||||
offsetof(AVFilterLink, in_packing),
|
||||
offsetof(AVFilterLink, out_packing));
|
||||
}
|
||||
#endif
|
||||
|
@ -285,19 +285,6 @@ const int64_t avfilter_all_channel_layouts[] = {
|
||||
// return avfilter_make_format64_list(avfilter_all_channel_layouts);
|
||||
// }
|
||||
|
||||
#if FF_API_PACKING
|
||||
AVFilterFormats *avfilter_make_all_packing_formats(void)
|
||||
{
|
||||
static const int packing[] = {
|
||||
AVFILTER_PACKED,
|
||||
AVFILTER_PLANAR,
|
||||
-1,
|
||||
};
|
||||
|
||||
return ff_make_format_list(packing);
|
||||
}
|
||||
#endif
|
||||
|
||||
AVFilterFormats *ff_planar_sample_fmts(void)
|
||||
{
|
||||
AVFilterFormats *ret = NULL;
|
||||
|
@ -56,9 +56,6 @@
|
||||
#ifndef FF_API_VSRC_BUFFER_ADD_FRAME
|
||||
#define FF_API_VSRC_BUFFER_ADD_FRAME (LIBAVFILTER_VERSION_MAJOR < 3)
|
||||
#endif
|
||||
#ifndef FF_API_PACKING
|
||||
#define FF_API_PACKING (LIBAVFILTER_VERSION_MAJOR < 3)
|
||||
#endif
|
||||
#ifndef FF_API_DEFAULT_CONFIG_OUTPUT_LINK
|
||||
#define FF_API_DEFAULT_CONFIG_OUTPUT_LINK (LIBAVFILTER_VERSION_MAJOR < 3)
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user