Michael Niedermayer
|
325f6e0a97
|
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>
|
2013-10-29 11:58:11 +01:00 |
|
Paul B Mahol
|
746e3142ee
|
avfilter/f_interleave: use the name 's' for the pointer to the private context
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2013-10-05 19:16:55 +00:00 |
|
Paul B Mahol
|
b890198b66
|
avfilter: add av_cold to init()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2013-09-27 18:51:49 +00:00 |
|
Paul B Mahol
|
b211607b5c
|
avfilter: various cosmetics
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2013-09-12 14:01:43 +00:00 |
|
Michael Niedermayer
|
f4341c64be
|
avfilter: add av_cold to uninit()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
|
2013-05-06 16:55:06 +02:00 |
|
Stefano Sabatini
|
3e40b85683
|
lavfi: add interleave filters
|
2013-04-21 18:24:04 +02:00 |
|