diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 11:50:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-29 11:58:11 +0100 |
| commit | 325f6e0a97c943807c665eb1d5c278f8d789156b (patch) | |
| tree | 4502d77d338015bfffe11a71ee8e80fd9bf98391 /libavfilter/af_amix.c | |
| parent | d3e13250a0308d8fda851e064ddbbbd7e574d880 (diff) | |
| parent | cd43ca0443a298ab8cf9f9567c568f83b67b656c (diff) | |
| download | ffmpeg-325f6e0a97c943807c665eb1d5c278f8d789156b.tar.gz | |
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>
Diffstat (limited to 'libavfilter/af_amix.c')
| -rw-r--r-- | libavfilter/af_amix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index 0902c2ac50..7140b6c744 100644 --- 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), |