Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
720ec620
Commit
720ec620
authored
Jun 25, 2012
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi: drop deprecated and disabled packing API
It was deprecated and removed after the recent 2->3 major bump.
parent
8dd0e87d
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
58 deletions
+0
-58
avfilter.h
libavfilter/avfilter.h
+0
-30
buffersink.h
libavfilter/buffersink.h
+0
-3
defaults.c
libavfilter/defaults.c
+0
-9
formats.c
libavfilter/formats.c
+0
-13
version.h
libavfilter/version.h
+0
-3
No files found.
libavfilter/avfilter.h
View file @
720ec620
...
@@ -113,9 +113,6 @@ typedef struct AVFilterBufferRefAudioProps {
...
@@ -113,9 +113,6 @@ typedef struct AVFilterBufferRefAudioProps {
uint64_t
channel_layout
;
///< channel layout of audio buffer
uint64_t
channel_layout
;
///< channel layout of audio buffer
int
nb_samples
;
///< number of audio samples per channel
int
nb_samples
;
///< number of audio samples per channel
int
sample_rate
;
///< audio buffer sample rate
int
sample_rate
;
///< audio buffer sample rate
#if FF_API_PACKING
int
planar
;
///< audio buffer - planar or packed
#endif
}
AVFilterBufferRefAudioProps
;
}
AVFilterBufferRefAudioProps
;
/**
/**
...
@@ -299,13 +296,6 @@ AVFilterFormats *avfilter_make_all_formats(enum AVMediaType type);
...
@@ -299,13 +296,6 @@ AVFilterFormats *avfilter_make_all_formats(enum AVMediaType type);
*/
*/
extern
const
int64_t
avfilter_all_channel_layouts
[];
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
* 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
* a and b. Also, all the references of a, all the references of b, and
...
@@ -350,10 +340,6 @@ attribute_deprecated
...
@@ -350,10 +340,6 @@ attribute_deprecated
void
avfilter_set_common_sample_formats
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
);
void
avfilter_set_common_sample_formats
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
);
attribute_deprecated
attribute_deprecated
void
avfilter_set_common_channel_layouts
(
AVFilterContext
*
ctx
,
AVFilterFormats
*
formats
);
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 {
...
@@ -656,13 +642,6 @@ struct AVFilterContext {
struct
AVFilterCommand
*
command_queue
;
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
* A link between two filters. This contains pointers to the source and
* destination filters between which this link exists, and the indexes of
* destination filters between which this link exists, and the indexes of
...
@@ -697,10 +676,6 @@ struct AVFilterLink {
...
@@ -697,10 +676,6 @@ struct AVFilterLink {
#else
#else
int
sample_rate
;
///< samples per second
int
sample_rate
;
///< samples per second
#endif
#endif
#if FF_API_PACKING
int
planar
;
///< agreed upon packing mode of audio buffers. true if planar.
#endif
int
format
;
///< agreed upon media format
int
format
;
///< agreed upon media format
/**
/**
...
@@ -713,11 +688,6 @@ struct AVFilterLink {
...
@@ -713,11 +688,6 @@ struct AVFilterLink {
AVFilterFormats
*
in_formats
;
AVFilterFormats
*
in_formats
;
AVFilterFormats
*
out_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
* The buffer reference currently being sent across the link by the source
* filter. This is used internally by the filter system to allow
* filter. This is used internally by the filter system to allow
...
...
libavfilter/buffersink.h
View file @
720ec620
...
@@ -46,9 +46,6 @@ AVBufferSinkParams *av_buffersink_params_alloc(void);
...
@@ -46,9 +46,6 @@ AVBufferSinkParams *av_buffersink_params_alloc(void);
typedef
struct
{
typedef
struct
{
const
enum
AVSampleFormat
*
sample_fmts
;
///< list of allowed sample formats, terminated by AV_SAMPLE_FMT_NONE
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
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
;
}
AVABufferSinkParams
;
/**
/**
...
...
libavfilter/defaults.c
View file @
720ec620
...
@@ -46,12 +46,3 @@ static void set_common_formats(AVFilterContext *ctx, AVFilterFormats *fmts,
...
@@ -46,12 +46,3 @@ static void set_common_formats(AVFilterContext *ctx, AVFilterFormats *fmts,
av_free
(
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
libavfilter/formats.c
View file @
720ec620
...
@@ -285,19 +285,6 @@ const int64_t avfilter_all_channel_layouts[] = {
...
@@ -285,19 +285,6 @@ const int64_t avfilter_all_channel_layouts[] = {
// return avfilter_make_format64_list(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
*
ff_planar_sample_fmts
(
void
)
{
{
AVFilterFormats
*
ret
=
NULL
;
AVFilterFormats
*
ret
=
NULL
;
...
...
libavfilter/version.h
View file @
720ec620
...
@@ -56,9 +56,6 @@
...
@@ -56,9 +56,6 @@
#ifndef FF_API_VSRC_BUFFER_ADD_FRAME
#ifndef FF_API_VSRC_BUFFER_ADD_FRAME
#define FF_API_VSRC_BUFFER_ADD_FRAME (LIBAVFILTER_VERSION_MAJOR < 3)
#define FF_API_VSRC_BUFFER_ADD_FRAME (LIBAVFILTER_VERSION_MAJOR < 3)
#endif
#endif
#ifndef FF_API_PACKING
#define FF_API_PACKING (LIBAVFILTER_VERSION_MAJOR < 3)
#endif
#ifndef FF_API_DEFAULT_CONFIG_OUTPUT_LINK
#ifndef FF_API_DEFAULT_CONFIG_OUTPUT_LINK
#define FF_API_DEFAULT_CONFIG_OUTPUT_LINK (LIBAVFILTER_VERSION_MAJOR < 3)
#define FF_API_DEFAULT_CONFIG_OUTPUT_LINK (LIBAVFILTER_VERSION_MAJOR < 3)
#endif
#endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment