Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 13 Jun 2011 02:25:36 +0000 (04:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 13 Jun 2011 02:39:58 +0000 (04:39 +0200)
commit058d03631afcaa4eb8f61c80c920a192b27d1ca2
tree82510152837d93c0d3064facfc2cf5b33f6133fb
parent21d5de930360bb29482aabd869074b9fd7b74ce3
parentde859358830cfd1daffb1773f6bb069659027321
Merge remote-tracking branch 'qatar/master'

* 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>
cmdutils.c