Michael Niedermayer
1dbc98461b
avfilter/vf_mergeplanes: Avoid using non public AV_PIX_FMT_NB
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2014-05-27 17:44:15 +02:00
Stefano Sabatini
3b8c7da7a3
lavu,lavfi,lavd: do not hardcode AV_PIX_FMT_NB value when setting pixel format max value
...
The constant may change in libavutil but the library may be compiled
against an older version, thus rejecting a value which is otherwise
supported by the new libavutil.
INT_MAX is used here to denote the max allowed value for a pixel format.
The opt-test code is changed to provide a valid reference example.
2013-12-26 11:35:27 +01:00
Michael Niedermayer
bc9cee98c0
avfilter/vf_mergeplanes: specify pixel format min/max
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-12-08 16:07:19 +01:00
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
292902ea9f
avfilter: add mergeplanes filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-10-27 18:58:43 +00:00
