har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avfilter/f_zmq: Deduplicate AVClasses

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-10 22:33:16 +02:00
parent a10a300606
commit c8180c1310
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/f_zmq.c
View File

@ -203,10 +203,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *ref)
return ff_filter_frame(ctx->outputs[0], ref); return ff_filter_frame(ctx->outputs[0], ref);
} }
#if CONFIG_ZMQ_FILTER AVFILTER_DEFINE_CLASS_EXT(zmq, "(a)zmq", options);
#define zmq_options options #if CONFIG_ZMQ_FILTER
AVFILTER_DEFINE_CLASS(zmq);
static const AVFilterPad zmq_inputs[] = { static const AVFilterPad zmq_inputs[] = {
{ {
@ -238,9 +237,6 @@ const AVFilter ff_vf_zmq = {
#if CONFIG_AZMQ_FILTER #if CONFIG_AZMQ_FILTER
#define azmq_options options
AVFILTER_DEFINE_CLASS(azmq);
static const AVFilterPad azmq_inputs[] = { static const AVFilterPad azmq_inputs[] = {
{ {
.name = "default", .name = "default",
@ -259,12 +255,12 @@ static const AVFilterPad azmq_outputs[] = {
const AVFilter ff_af_azmq = { const AVFilter ff_af_azmq = {
.name = "azmq", .name = "azmq",
.description = NULL_IF_CONFIG_SMALL("Receive commands through ZMQ and broker them to filters."), .description = NULL_IF_CONFIG_SMALL("Receive commands through ZMQ and broker them to filters."),
.priv_class = &zmq_class,
.init = init, .init = init,
.uninit = uninit, .uninit = uninit,
.priv_size = sizeof(ZMQContext), .priv_size = sizeof(ZMQContext),
FILTER_INPUTS(azmq_inputs), FILTER_INPUTS(azmq_inputs),
FILTER_OUTPUTS(azmq_outputs), FILTER_OUTPUTS(azmq_outputs),
.priv_class = &azmq_class,
}; };
#endif #endif