Merge remote-tracking branch 'cigaes/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Apr 2013 13:13:02 +0000 (15:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Apr 2013 13:13:07 +0000 (15:13 +0200)
commit599866f5d5e6d27657a3f4f5d4c1bc8785143c99
tree3a5f0ffeecd3842ea29830db371f52dda1ca4748
parentce841bc0326327b73659d7157ebcf25f235ef470
parent52853077ee49db8ecb6f83d0f9a177708b5d93a6
Merge remote-tracking branch 'cigaes/master'

* 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>