RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
71,827 Commits 37 Branches 400 Tags 271 MiB
Commit Graph

31 Commits

Author SHA1 Message Date
Michael Niedermayer f5c5aa968c Merge commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641' 
* commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641':
  xcbgrab: Validate the capture area

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-30 22:15:22 +02:00
Michael Niedermayer dc83733f2b Merge commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b' 
* commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b':
  xcbgrab: Do not assume the non shm image data is always available

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-04-30 22:00:10 +02:00
Luca Barbato e8c4db0d4d xcbgrab: Validate the capture area 
And notify why the capture is impossible.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-30 14:10:13 +02:00
Luca Barbato 82a10225f8 xcbgrab: Do not assume the non shm image data is always available 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-04-30 14:10:13 +02:00
Michael Niedermayer fe25194c58 Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200' 
* 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-09 21:07:24 +02:00
Diego Biurrun c201069fac avdevice: Add missing header for NULL_IF_CONFIG_SMALL 
Also reshuffle headers into canonical order where appropriate.
 2015-04-09 16:40:12 +02:00
Vittorio Giovara edca1dd552 xcbgrab: Check av_strdup() allocation 
Bug-Id: CID 1274038
 2015-03-12 15:29:59 +00:00
Michael Niedermayer 3360c6ac0c Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8' 
* 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-08 19:44:09 +01:00
Luca Barbato 5f5b78aca3 xcbgrab: Free the host string after checking the connection 
Prevent an use after free in the error message.

Bug-Id: CID 1274040
CC: libav-stable@libav.org
 2015-03-08 14:39:01 +01:00
Michael Niedermayer a1b5cf0181 Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b' 
* commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b':
  xcbgrab: Unbreak parsing filename options

Conflicts:
	libavdevice/xcbgrab.c

See: db442c8736
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-25 01:44:49 +01:00
Michael Niedermayer 2fbdf30efe Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c' 
* 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-25 01:12:50 +01:00
Luca Barbato 85b3b1c4ba xcbgrab: Unbreak parsing filename options 
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-02-24 22:31:20 +01:00
Luca Barbato b31328d008 xcbgrab: Provide better names for the y and x option 
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-24 22:31:20 +01:00
Michael Niedermayer 3171ac209b Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42' 
* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
  xcbgrab: Correctly make shm optional

Conflicts:
	libavdevice/xcbgrab.c

See: 8c0ae9015a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-02-15 20:42:52 +01:00
Luca Barbato d40815a982 xcbgrab: Correctly make shm optional 
The segment field in the struct has to be conditionally build
as well.
 2015-02-15 18:20:54 +01:00
Daniel Moran 51ca3cb604 xcbgrab: Use the correct geometry for the region highlight 
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>
 2015-02-15 18:20:54 +01:00
Michael Niedermayer c054cff87a Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788' 
* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788':
  xcbgrab: Move NULL check before pointer dereference

Conflicts:
	libavdevice/xcbgrab.c

See: e86df0206f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-19 05:14:38 +01:00
Vittorio Giovara 9e06327ecb xcbgrab: Move NULL check before pointer dereference 
Bug-Id: CID 1254668
 2014-12-18 23:27:14 +01:00
Michael Niedermayer 81a045fe17 Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33' 
* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33':
  xcbgrab: Support empty filename string correctly

Conflicts:
	libavdevice/xcbgrab.c

See: 62eca2f827
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-10 12:33:37 +01:00
Luca Barbato 2c3f29c489 xcbgrab: Support empty filename string correctly 
Bug-Id: CID 1254664
CC: libav-stable@libav.org
 2014-12-10 01:45:50 +01:00
Michael Niedermayer e86df0206f avdevice/xcbgrab: check xcb_query_pointer_reply_t pointer before use 
Fixes CID1254668

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-12-09 01:54:51 +01:00
Carl Eugen Hoyos 7502e1a3b7 Fix xcb 32bit pix_fmts: There is no screen transparency. 2014-12-08 00:31:01 +01:00
Daniel Moran 0ae37e460c avdevice/xcbgrab: Fix show_region rectangle 
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-12-07 16:13:30 +01:00
Boris Reisig 54170a33c2 avdevice/xcbgrab: fix undefined reference to xcb_shape_rectangles in xcbgrab.c 
works with (--enable-libxcb-shape)  and without (--disable-libxcb-shape) now.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-24 16:57:47 +01:00
Michael Niedermayer 62eca2f827 avdevice/xcbgrab: Fix/remove unneeded NULL checks 
Fixes CID1254664

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-11-16 19:01:10 +01:00
Michael Niedermayer db442c8736 avdevice/xcbgrab: Fix offset support 
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-30 14:34:07 +01:00
Carl Eugen Hoyos 792f0f2045 Fix compilation of xcbgrab if xcb/shape.h is not available. 
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-30 10:22:34 +01:00
Carl Eugen Hoyos 8c0ae9015a Fix xcbgrab build if shm is not available. 2014-10-30 10:05:45 +01:00
Michael Niedermayer 280da99a8f avdevice/xcbgrab: set avclass category 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-28 12:07:20 +01:00
Michael Niedermayer a38a1d516f Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96' 
* 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-27 21:26:51 +01:00
Luca Barbato a6674d2e77 xcbgrab: XCB-based screen capture 
Matches the x11grab screen capture by features.
 2014-10-26 08:47:41 +01:00