diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 21:50:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-12 21:51:15 +0100 |
| commit | 98c387c9c1cd8337b63e6e6544319127f6e82f94 (patch) | |
| tree | 0ad814709cffa98fed8627f565755423f0a1a554 | |
| parent | a91c175db20834d6474b104619505bcb537bf3f9 (diff) | |
| parent | edca1dd552efa1ebef016ca9eff4ce6757605819 (diff) | |
| download | ffmpeg-98c387c9c1cd8337b63e6e6544319127f6e82f94.tar.gz | |
Merge commit 'edca1dd552efa1ebef016ca9eff4ce6757605819'
* commit 'edca1dd552efa1ebef016ca9eff4ce6757605819':
xcbgrab: Check av_strdup() allocation
Conflicts:
libavdevice/xcbgrab.c
See: db442c873631065e8719df6da91c016d25501084
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions