Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-06lavd/xcbgrab: fix comparison with screen size.Nicolas George
Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30Merge commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641'Michael Niedermayer
* commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641': xcbgrab: Validate the capture area Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30Merge commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b'Michael Niedermayer
* commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b': xcbgrab: Do not assume the non shm image data is always available Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30xcbgrab: Validate the capture areaLuca Barbato
And notify why the capture is impossible. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-30xcbgrab: Do not assume the non shm image data is always availableLuca Barbato
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-09Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'Michael Niedermayer
* commit 'c201069fac9a76e6604f9d84d76a172434d62200': avdevice: Add missing header for NULL_IF_CONFIG_SMALL Conflicts: libavdevice/alsa-audio-dec.c libavdevice/alsa-audio-enc.c libavdevice/pulse_audio_dec.c libavdevice/sndio_enc.c libavdevice/vfwcap.c libavdevice/x11grab.c libavdevice/xcbgrab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09avdevice: Add missing header for NULL_IF_CONFIG_SMALLDiego Biurrun
Also reshuffle headers into canonical order where appropriate.
2015-03-12xcbgrab: Check av_strdup() allocationVittorio Giovara
Bug-Id: CID 1274038
2015-03-08Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'Michael Niedermayer
* commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8': xcbgrab: Free the host string after checking the connection Conflicts: libavdevice/xcbgrab.c No change as the bug was not in FFmpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-08xcbgrab: Free the host string after checking the connectionLuca Barbato
Prevent an use after free in the error message. Bug-Id: CID 1274040 CC: libav-stable@libav.org
2015-02-25Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'Michael Niedermayer
* commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b': xcbgrab: Unbreak parsing filename options Conflicts: libavdevice/xcbgrab.c See: db442c873631065e8719df6da91c016d25501084 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'Michael Niedermayer
* commit 'b31328d008985f87f0a7c83c700847cef1a4f08c': xcbgrab: Provide better names for the y and x option Conflicts: doc/indevs.texi libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25xcbgrab: Unbreak parsing filename optionsLuca Barbato
CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-25xcbgrab: Provide better names for the y and x optionLuca Barbato
Incidentally `-y` also collides with avconv global options. Update x11grab to match and document the option. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-15Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'Michael Niedermayer
* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42': xcbgrab: Correctly make shm optional Conflicts: libavdevice/xcbgrab.c See: 8c0ae9015a2bd8b3f4f92c35570e592e7fdeaef0 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15xcbgrab: Correctly make shm optionalLuca Barbato
The segment field in the struct has to be conditionally build as well.
2015-02-15xcbgrab: Use the correct geometry for the region highlightDaniel Moran
The feature is implemented using a transparent window and drawing inside it a rectangle filling the whole window to highlight it. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-12-19Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'Michael Niedermayer
* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788': xcbgrab: Move NULL check before pointer dereference Conflicts: libavdevice/xcbgrab.c See: e86df0206f06b8d1e97e2b60db8f74a398d53127 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19xcbgrab: Move NULL check before pointer dereferenceVittorio Giovara
Bug-Id: CID 1254668
2014-12-10Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'Michael Niedermayer
* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33': xcbgrab: Support empty filename string correctly Conflicts: libavdevice/xcbgrab.c See: 62eca2f827d441f52125191fd78c96b67a7ba30c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-10xcbgrab: Support empty filename string correctlyLuca Barbato
Bug-Id: CID 1254664 CC: libav-stable@libav.org
2014-12-09avdevice/xcbgrab: check xcb_query_pointer_reply_t pointer before useMichael Niedermayer
Fixes CID1254668 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-08Fix xcb 32bit pix_fmts: There is no screen transparency.Carl Eugen Hoyos
2014-12-07avdevice/xcbgrab: Fix show_region rectangleDaniel Moran
Fixes trac ticket #4164 This is to address an error when using show_region, which would cause part of the captured area to become static. It looks like the rectangle specifying the capture area was relative to the capture window. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24avdevice/xcbgrab: fix undefined reference to xcb_shape_rectangles in xcbgrab.cBoris Reisig
works with (--enable-libxcb-shape) and without (--disable-libxcb-shape) now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-16avdevice/xcbgrab: Fix/remove unneeded NULL checksMichael Niedermayer
Fixes CID1254664 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-30avdevice/xcbgrab: Fix offset supportMichael Niedermayer
Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-30Fix compilation of xcbgrab if xcb/shape.h is not available.Carl Eugen Hoyos
Old versions of libxcb do not provide xcb_shape_rectangles(). The issue can be fixed differently but this small change fixes some fate platforms and a user reported compilation problem. Reported and tested by trac user kevmitch. Fixes ticket #4067.
2014-10-30Fix xcbgrab build if shm is not available.Carl Eugen Hoyos
2014-10-28avdevice/xcbgrab: set avclass categoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-27Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'Michael Niedermayer
* commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96': xcbgrab: XCB-based screen capture Conflicts: Changelog configure libavdevice/Makefile libavdevice/alldevices.c libavdevice/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26xcbgrab: XCB-based screen captureLuca Barbato
Matches the x11grab screen capture by features.