Merge remote-tracking branch 'qatar/master'

* qatar/master: lavfi: do not export the filters from shared objects Conflicts: libavfilter/af_amix.c libavfilter/af_anull.c libavfilter/asrc_anullsrc.c libavfilter/f_select.c libavfilter/f_settb.c libavfilter/split.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_colorbalance.c libavfilter/vf_copy.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_drawbox.c libavfilter/vf_format.c libavfilter/vf_framestep.c libavfilter/vf_frei0r.c libavfilter/vf_hflip.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_null.c libavfilter/vf_overlay.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_vflip.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
danimo · Oct 29, 2013 · 325f6e0 · 325f6e0
2 parents d3e1325 + cd43ca0
commit 325f6e0
Show file tree

Hide file tree

Showing 145 changed files with 176 additions and 176 deletions.
diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c
@@ -183,7 +183,7 @@ static const AVFilterPad aconvert_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_aconvert = {
+AVFilter ff_af_aconvert = {
     .name          = "aconvert",
     .description   = NULL_IF_CONFIG_SMALL("Convert the input audio to sample_fmt:channel_layout."),
     .priv_size     = sizeof(AConvertContext),

diff --git a/libavfilter/af_adelay.c b/libavfilter/af_adelay.c
@@ -270,7 +270,7 @@ static const AVFilterPad adelay_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_adelay = {
+AVFilter ff_af_adelay = {
     .name          = "adelay",
     .description   = NULL_IF_CONFIG_SMALL("Delay one or more audio channels."),
     .query_formats = query_formats,

diff --git a/libavfilter/af_aecho.c b/libavfilter/af_aecho.c
@@ -346,7 +346,7 @@ static const AVFilterPad aecho_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_aecho = {
+AVFilter ff_af_aecho = {
     .name          = "aecho",
     .description   = NULL_IF_CONFIG_SMALL("Add echoing to the audio."),
     .query_formats = query_formats,

diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c
@@ -287,7 +287,7 @@ static const AVFilterPad avfilter_af_afade_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_afade = {
+AVFilter ff_af_afade = {
     .name          = "afade",
     .description   = NULL_IF_CONFIG_SMALL("Fade in/out input audio."),
     .query_formats = query_formats,

diff --git a/libavfilter/af_aformat.c b/libavfilter/af_aformat.c
@@ -135,7 +135,7 @@ static const AVFilterPad avfilter_af_aformat_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_aformat = {
+AVFilter ff_af_aformat = {
     .name          = "aformat",
     .description   = NULL_IF_CONFIG_SMALL("Convert the input audio to one of the specified formats."),
     .init          = init,

diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
@@ -335,7 +335,7 @@ static const AVFilterPad amerge_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_amerge = {
+AVFilter ff_af_amerge = {
     .name          = "amerge",
     .description   = NULL_IF_CONFIG_SMALL("Merge two or more audio streams into "
                                           "a single multi-channel stream."),

diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c
@@ -546,7 +546,7 @@ static const AVFilterPad avfilter_af_amix_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_amix = {
+AVFilter ff_af_amix = {
     .name           = "amix",
     .description    = NULL_IF_CONFIG_SMALL("Audio mixing."),
     .priv_size      = sizeof(MixContext),

diff --git a/libavfilter/af_anull.c b/libavfilter/af_anull.c
@@ -43,7 +43,7 @@ static const AVFilterPad avfilter_af_anull_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_anull = {
+AVFilter ff_af_anull = {
     .name          = "anull",
     .description   = NULL_IF_CONFIG_SMALL("Pass the source unchanged to the output."),
     .query_formats = ff_query_formats_all,

diff --git a/libavfilter/af_apad.c b/libavfilter/af_apad.c
@@ -144,7 +144,7 @@ static const AVFilterPad apad_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_apad = {
+AVFilter ff_af_apad = {
     .name          = "apad",
     .description   = NULL_IF_CONFIG_SMALL("Pad audio with silence."),
     .init          = init,

diff --git a/libavfilter/af_aphaser.c b/libavfilter/af_aphaser.c
@@ -345,7 +345,7 @@ static const AVFilterPad aphaser_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_aphaser = {
+AVFilter ff_af_aphaser = {
     .name          = "aphaser",
     .description   = NULL_IF_CONFIG_SMALL("Add a phasing effect to the audio."),
     .query_formats = query_formats,

diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
@@ -296,7 +296,7 @@ static const AVFilterPad aresample_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_aresample = {
+AVFilter ff_af_aresample = {
     .name          = "aresample",
     .description   = NULL_IF_CONFIG_SMALL("Resample audio data."),
     .init_dict     = init_dict,

diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
@@ -184,7 +184,7 @@ static const AVFilterPad asetnsamples_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_asetnsamples = {
+AVFilter ff_af_asetnsamples = {
     .name        = "asetnsamples",
     .description = NULL_IF_CONFIG_SMALL("Set the number of samples for each output audio frames."),
     .priv_size   = sizeof(ASNSContext),

diff --git a/libavfilter/af_asetrate.c b/libavfilter/af_asetrate.c
@@ -107,7 +107,7 @@ static const AVFilterPad asetrate_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_asetrate = {
+AVFilter ff_af_asetrate = {
     .name          = "asetrate",
     .description   = NULL_IF_CONFIG_SMALL("Change the sample rate without "
                                           "altering the data."),

diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c
@@ -116,7 +116,7 @@ static const AVFilterPad outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_ashowinfo = {
+AVFilter ff_af_ashowinfo = {
     .name        = "ashowinfo",
     .description = NULL_IF_CONFIG_SMALL("Show textual information for each audio frame."),
     .priv_size   = sizeof(AShowInfoContext),

diff --git a/libavfilter/af_astats.c b/libavfilter/af_astats.c
@@ -262,7 +262,7 @@ static const AVFilterPad astats_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_astats = {
+AVFilter ff_af_astats = {
     .name          = "astats",
     .description   = NULL_IF_CONFIG_SMALL("Show time domain statistics about audio frames."),
     .query_formats = query_formats,

diff --git a/libavfilter/af_astreamsync.c b/libavfilter/af_astreamsync.c
@@ -226,7 +226,7 @@ static const AVFilterPad astreamsync_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_astreamsync = {
+AVFilter ff_af_astreamsync = {
     .name          = "astreamsync",
     .description   = NULL_IF_CONFIG_SMALL("Copy two streams of audio data "
                                           "in a configurable order."),

diff --git a/libavfilter/af_asyncts.c b/libavfilter/af_asyncts.c
@@ -309,7 +309,7 @@ static const AVFilterPad avfilter_af_asyncts_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_asyncts = {
+AVFilter ff_af_asyncts = {
     .name        = "asyncts",
     .description = NULL_IF_CONFIG_SMALL("Sync audio data to timestamps"),
     .init        = init,

diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c
@@ -1182,7 +1182,7 @@ static const AVFilterPad atempo_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_atempo = {
+AVFilter ff_af_atempo = {
     .name            = "atempo",
     .description     = NULL_IF_CONFIG_SMALL("Adjust audio tempo."),
     .init            = init,

diff --git a/libavfilter/af_biquads.c b/libavfilter/af_biquads.c
@@ -454,7 +454,7 @@ static av_cold int name_##_init(AVFilterContext *ctx) \
     return init(ctx);                                             \
 }                                                                       \
                                                          \
-AVFilter avfilter_af_##name_ = {                         \
+AVFilter ff_af_##name_ = {                         \
     .name          = #name_,                             \
     .description   = NULL_IF_CONFIG_SMALL(description_), \
     .priv_size     = sizeof(BiquadsContext),             \

diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c
@@ -397,7 +397,7 @@ static const AVFilterPad avfilter_af_channelmap_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_channelmap = {
+AVFilter ff_af_channelmap = {
     .name          = "channelmap",
     .description   = NULL_IF_CONFIG_SMALL("Remap audio channels."),
     .init          = channelmap_init,

diff --git a/libavfilter/af_channelsplit.c b/libavfilter/af_channelsplit.c
@@ -136,7 +136,7 @@ static const AVFilterPad avfilter_af_channelsplit_inputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_channelsplit = {
+AVFilter ff_af_channelsplit = {
     .name           = "channelsplit",
     .description    = NULL_IF_CONFIG_SMALL("Split audio into per-channel streams."),
     .priv_size      = sizeof(ChannelSplitContext),

diff --git a/libavfilter/af_compand.c b/libavfilter/af_compand.c
@@ -505,7 +505,7 @@ static const AVFilterPad compand_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_compand = {
+AVFilter ff_af_compand = {
     .name          = "compand",
     .description   = NULL_IF_CONFIG_SMALL("Compress or expand audio dynamic range."),
     .query_formats = query_formats,

diff --git a/libavfilter/af_earwax.c b/libavfilter/af_earwax.c
@@ -162,7 +162,7 @@ static const AVFilterPad earwax_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_earwax = {
+AVFilter ff_af_earwax = {
     .name           = "earwax",
     .description    = NULL_IF_CONFIG_SMALL("Widen the stereo image."),
     .query_formats  = query_formats,

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
@@ -501,7 +501,7 @@ static const AVFilterPad avfilter_af_join_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_join = {
+AVFilter ff_af_join = {
     .name           = "join",
     .description    = NULL_IF_CONFIG_SMALL("Join multiple audio streams into "
                                            "multi-channel output."),

diff --git a/libavfilter/af_ladspa.c b/libavfilter/af_ladspa.c
@@ -688,7 +688,7 @@ static const AVFilterPad ladspa_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_ladspa = {
+AVFilter ff_af_ladspa = {
     .name          = "ladspa",
     .description   = NULL_IF_CONFIG_SMALL("Apply LADSPA effect."),
     .priv_size     = sizeof(LADSPAContext),

diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
@@ -409,7 +409,7 @@ static const AVFilterPad pan_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_pan = {
+AVFilter ff_af_pan = {
     .name          = "pan",
     .description   = NULL_IF_CONFIG_SMALL("Remix channels with coefficients (panning)."),
     .priv_size     = sizeof(PanContext),

diff --git a/libavfilter/af_replaygain.c b/libavfilter/af_replaygain.c
@@ -602,7 +602,7 @@ static const AVFilterPad replaygain_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_replaygain = {
+AVFilter ff_af_replaygain = {
     .name          = "replaygain",
     .description   = NULL_IF_CONFIG_SMALL("ReplayGain scanner."),
     .query_formats = query_formats,

diff --git a/libavfilter/af_resample.c b/libavfilter/af_resample.c
@@ -314,7 +314,7 @@ static const AVFilterPad avfilter_af_resample_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_resample = {
+AVFilter ff_af_resample = {
     .name          = "resample",
     .description   = NULL_IF_CONFIG_SMALL("Audio resampling and conversion."),
     .priv_size     = sizeof(ResampleContext),

diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c
@@ -201,7 +201,7 @@ static const AVFilterPad silencedetect_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_silencedetect = {
+AVFilter ff_af_silencedetect = {
     .name          = "silencedetect",
     .description   = NULL_IF_CONFIG_SMALL("Detect silence."),
     .priv_size     = sizeof(SilenceDetectContext),

diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c
@@ -287,7 +287,7 @@ static const AVFilterPad avfilter_af_volume_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_volume = {
+AVFilter ff_af_volume = {
     .name           = "volume",
     .description    = NULL_IF_CONFIG_SMALL("Change input volume."),
     .query_formats  = query_formats,

diff --git a/libavfilter/af_volumedetect.c b/libavfilter/af_volumedetect.c
@@ -148,7 +148,7 @@ static const AVFilterPad volumedetect_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_af_volumedetect = {
+AVFilter ff_af_volumedetect = {
     .name          = "volumedetect",
     .description   = NULL_IF_CONFIG_SMALL("Detect audio volume."),
     .priv_size     = sizeof(VolDetectContext),

diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
@@ -26,15 +26,15 @@
 
 #define REGISTER_FILTER(X, x, y)                                        \
     {                                                                   \
-        extern AVFilter avfilter_##y##_##x;                             \
+        extern AVFilter ff_##y##_##x;                                   \
         if (CONFIG_##X##_FILTER)                                        \
-            avfilter_register(&avfilter_##y##_##x);                     \
+            avfilter_register(&ff_##y##_##x);                           \
     }
 
 #define REGISTER_FILTER_UNCONDITIONAL(x)                                \
     {                                                                   \
-        extern AVFilter avfilter_##x;                                   \
-        avfilter_register(&avfilter_##x);                               \
+        extern AVFilter ff_##x;                                         \
+        avfilter_register(&ff_##x);                                     \
     }
 
 void avfilter_register_all(void)

diff --git a/libavfilter/asink_anullsink.c b/libavfilter/asink_anullsink.c
@@ -37,7 +37,7 @@ static const AVFilterPad avfilter_asink_anullsink_inputs[] = {
     { NULL },
 };
 
-AVFilter avfilter_asink_anullsink = {
+AVFilter ff_asink_anullsink = {
     .name        = "anullsink",
     .description = NULL_IF_CONFIG_SMALL("Do absolutely nothing with the input audio."),
 

diff --git a/libavfilter/asrc_aevalsrc.c b/libavfilter/asrc_aevalsrc.c
@@ -229,7 +229,7 @@ static const AVFilterPad aevalsrc_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_asrc_aevalsrc = {
+AVFilter ff_asrc_aevalsrc = {
     .name          = "aevalsrc",
     .description   = NULL_IF_CONFIG_SMALL("Generate an audio signal generated by an expression."),
     .query_formats = query_formats,

diff --git a/libavfilter/asrc_anullsrc.c b/libavfilter/asrc_anullsrc.c
@@ -134,7 +134,7 @@ static const AVFilterPad avfilter_asrc_anullsrc_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_asrc_anullsrc = {
+AVFilter ff_asrc_anullsrc = {
     .name          = "anullsrc",
     .description   = NULL_IF_CONFIG_SMALL("Null audio source, return empty audio frames."),
     .init          = init,

diff --git a/libavfilter/asrc_flite.c b/libavfilter/asrc_flite.c
@@ -270,7 +270,7 @@ static const AVFilterPad flite_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_asrc_flite = {
+AVFilter ff_asrc_flite = {
     .name          = "flite",
     .description   = NULL_IF_CONFIG_SMALL("Synthesize voice from text using libflite."),
     .query_formats = query_formats,

diff --git a/libavfilter/asrc_sine.c b/libavfilter/asrc_sine.c
@@ -210,7 +210,7 @@ static const AVFilterPad sine_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_asrc_sine = {
+AVFilter ff_asrc_sine = {
     .name          = "sine",
     .description   = NULL_IF_CONFIG_SMALL("Generate sine wave audio signal."),
     .query_formats = query_formats,

diff --git a/libavfilter/avf_avectorscope.c b/libavfilter/avf_avectorscope.c
@@ -261,7 +261,7 @@ static const AVFilterPad audiovectorscope_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_avf_avectorscope = {
+AVFilter ff_avf_avectorscope = {
     .name          = "avectorscope",
     .description   = NULL_IF_CONFIG_SMALL("Convert input audio to vectorscope video output."),
     .uninit        = uninit,

diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
@@ -412,7 +412,7 @@ static av_cold void uninit(AVFilterContext *ctx)
     av_free(cat->in);
 }
 
-AVFilter avfilter_avf_concat = {
+AVFilter ff_avf_concat = {
     .name          = "concat",
     .description   = NULL_IF_CONFIG_SMALL("Concatenate audio and video streams."),
     .init          = init,

diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c
@@ -490,7 +490,7 @@ static const AVFilterPad showspectrum_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_avf_showspectrum = {
+AVFilter ff_avf_showspectrum = {
     .name          = "showspectrum",
     .description   = NULL_IF_CONFIG_SMALL("Convert input audio to a spectrum video output."),
     .uninit        = uninit,

diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
@@ -244,7 +244,7 @@ static const AVFilterPad showwaves_outputs[] = {
     { NULL }
 };
 
-AVFilter avfilter_avf_showwaves = {
+AVFilter ff_avf_showwaves = {
     .name          = "showwaves",
     .description   = NULL_IF_CONFIG_SMALL("Convert input audio to a video output."),
     .uninit        = uninit,