* qatar/master:
  cmdutils: add missing NULL check in parse_options()
  x11grab: remove a memory allocation and the associated memcpy.
Merged-by: Michael Niedermayer <michaelni@gmx.at>