-
Michael Niedermayer authored
* cigaes/master: lavfi/af_asetnsamples: fix EOF handling. lavu/opt: make sure av_opt_set_bin() handles NULL/0. lavd/v4l2: fully init an ioctl argument. lavfi: detect merge failure for unknown layouts. Merged-by:
Michael Niedermayer <michaelni@gmx.at>
599866f5