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
|
5f99e6d632
|
avfilter/vf_pullup: do not ignore frame field order
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2013-10-03 02:43:20 +00:00 |
|
Paul B Mahol
|
7f4a5006ce
|
avfilter/vf_pullup: remove junk_down nonsense
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2013-09-18 12:47:57 +00:00 |
|
Paul B Mahol
|
d520055000
|
avfilter/vf_pullup: change log level to error
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2013-09-18 11:56:36 +00:00 |
|
Paul B Mahol
|
fe5b7612c0
|
avfilter/vf_pullup: fix memleak of metrics for last PullupField
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2013-09-18 11:56:35 +00:00 |
|
Paul B Mahol
|
394a73cad2
|
avfilter/vf_pullup: make sure metric_plane is available
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2013-09-18 11:27:41 +00:00 |
|
Paul B Mahol
|
9c774459a9
|
avfilter: port pullup filter from libmpcodecs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
|
2013-09-17 17:03:36 +00:00 |
|