diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-05 03:35:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-05 03:42:55 +0200 |
| commit | 345160a9cdf27c928c2430101513c5882e6f9fe1 (patch) | |
| tree | 6cd256a054f852e8177729c2346fd955413bf34b /libavcodec/vorbisenc.c | |
| parent | 8e5be0fffe9fee1916bb62bc343f56eb4b6af020 (diff) | |
| parent | 2a5ac99e6e06078713f684fee2466c91f677b303 (diff) | |
| download | ffmpeg-345160a9cdf27c928c2430101513c5882e6f9fe1.tar.gz | |
Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303'
* commit '2a5ac99e6e06078713f684fee2466c91f677b303':
x11grab: Check the XQueryPointer return value
Conflicts:
libavdevice/x11grab.c
See: 69c34a6ac986e31b5286a1d566617ec25b93e6a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vorbisenc.c')
0 files changed, 0 insertions, 0 deletions