diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-05 03:22:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-05 03:22:55 +0200 |
| commit | 8e5be0fffe9fee1916bb62bc343f56eb4b6af020 (patch) | |
| tree | 3fe1a4bd38da38dfed96244bd321832cae35a13b /libavutil/arm/timer.h | |
| parent | 98baa8151a50777c327d88a500eb9048332866bb (diff) | |
| parent | 5b9c817dc7577b6d44acc94d73b9c77c52cda489 (diff) | |
| download | ffmpeg-streaming-8e5be0fffe9fee1916bb62bc343f56eb4b6af020.zip ffmpeg-streaming-8e5be0fffe9fee1916bb62bc343f56eb4b6af020.tar.gz | |
Merge commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489'
* commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489':
x11grab: Check XFixesGetCursorImage return value
Conflicts:
libavdevice/x11grab.c
See: a65c0a3fe822386be30fd3371af9f0d008b02874
The warning with adjusted text is kept from a65c0a3fe822386be30fd3371af9f0d008b02874
but drawing the cursor is not disabled in case XFixesGetCursorImage() fails
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/arm/timer.h')
0 files changed, 0 insertions, 0 deletions
