From 720ec620123bf12f1effc311285f8f501c40e5c6 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 26 Jun 2012 00:52:30 +0200 Subject: lavfi: drop deprecated and disabled packing API It was deprecated and removed after the recent 2->3 major bump. --- libavfilter/avfilter.h | 30 ------------------------------ 1 file changed, 30 deletions(-) (limited to 'libavfilter/avfilter.h') diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 0a10e9e..7704e81 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -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 -- cgit v1.1