Commit 98c387c9 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'edca1dd5'

* commit 'edca1dd5':
  xcbgrab: Check av_strdup() allocation

Conflicts:
	libavdevice/xcbgrab.c

See: db442c87Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a91c175d edca1dd5
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment