Merge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819'

Browse Source

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

Conflicts:
	libavdevice/xcbgrab.c

See: db442c873631065e8719df6da91c016d25501084
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2015-03-12 21:50:36 +01:00

parent a91c175db2 edca1dd552

commit 98c387c9c1

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available