summaryrefslogtreecommitdiff
path: root/libavdevice
Commit message (Collapse)AuthorAge
* Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303'Michael Niedermayer2014-10-05
|\ | | | | | | | | | | | | | | | | | | | | * commit '2a5ac99e6e06078713f684fee2466c91f677b303': x11grab: Check the XQueryPointer return value Conflicts: libavdevice/x11grab.c See: 69c34a6ac986e31b5286a1d566617ec25b93e6a7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Check the XQueryPointer return valueAntonio Ospite2014-10-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The paint_mouse_pointer() code uses XFixes to retrieve the cursor coordinates, but XFixes gives no information about which screen the pointer is on; this results in always drawing the cursor on the captured screen even if the mouse pointer was on another screen. For example, when capturing from screen 1 (i.e. -f x11grab -i ":0.1") the cursor was being drawn in the captured image even when the mouse pointer was actually on screen 0, which is wrong and visually confusing. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489'Michael Niedermayer2014-10-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * x11grab: Check XFixesGetCursorImage return valueLuca Barbato2014-10-04
| | | | | | | | | | | | | | It could return NULL if the cursor is outside the screen, the connection timed out or the system is out of memory. CC: libav-stable@libav.org
* | Merge commit '89fa2b5616274194d90bde0aeebf6adbd1245193'Michael Niedermayer2014-10-05
|\| | | | | | | | | | | | | | | * commit '89fa2b5616274194d90bde0aeebf6adbd1245193': x11grab: Check for XFixes availability at runtime See: a65c0a3fe822386be30fd3371af9f0d008b02874 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Check for XFixes availability at runtimeLuca Barbato2014-10-04
| |
* | lavd/avfoundation: Add basic PCM audio support.Thilo Borgmann2014-09-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/avfoundation: Use microseconds as common timebase.Thilo Borgmann2014-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/avfoundation: Simplify debug message generation.Thilo Borgmann2014-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/avfoundation: Using the actual stream index instead of hardcoded value.Thilo Borgmann2014-09-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/avfoundation: Split adding a device and getting the device ↵Thilo Borgmann2014-09-26
| | | | | | | | | | | | configuration into separate functions. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Skip decklink_common_c.h when running make checkheaders.Carl Eugen Hoyos2014-09-23
| |
* | avdevice/version: bump minor for the decklink inputMichael Niedermayer2014-09-22
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice: add decklink input supportDeti Fliegl2014-09-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/decklink: move general code of decklink encoder to common fileDeti Fliegl2014-09-22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/lavfi: dont assign variables to themselfsMichael Niedermayer2014-09-13
| | | | | | | | | | | | Fixes "warning: explicitly assigning a variable of type int to itself" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/x11grab: fix cursor drawing in multi-screen setupAntonio Ospite2014-09-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code uses XFixes to retrieve the cursor coordinates, but XFixes gives no information of what screen the pointer is on; this results in always drawing the cursor on the captured screen even if the mouse pointer was on another screen. For example, when capturing from screen 1 (i.e. -f x11grab -i ":0.1") the cursor was being drawn in the captured image even when the mouse pointer was actually on screen 0, which is wrong and visually confusing. Use XQueryPointer to check that the pointer is actually on the screen which is being captured. Signed-off-by: Antonio Ospite <ao2@ao2.it> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/x11grab: rename the "w" Window to "root" in paint_mouse_pointerAntonio Ospite2014-09-09
| | | | | | | | | | | | | | | | | | This specifies better the meaning of the variable, and is also in preparation of a subsequent change which will introduce a temporary Window variable for which "w" is an good name. Signed-off-by: Antonio Ospite <ao2@ao2.it> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: introduce enqueue_buffer()Giorgio Vazzana2014-09-06
| | | | | | | | | | | | | | | | Additionally, make sure a buffer gets enqueued again (even in error paths) after it has been succesfully dequeued. Tested-by: Dmitry Volyntsev <xeioexception@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: simplify list_formats()Giorgio Vazzana2014-09-05
| | | | | | | | | | | | We can avoid passing file descriptor fd explicitely. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: simplify list_framesizes()Giorgio Vazzana2014-09-05
| | | | | | | | | | | | We can avoid passing file descriptor fd explicitely. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: remove unneeded variable in device_init()Giorgio Vazzana2014-09-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: simplify first_field()Giorgio Vazzana2014-09-05
| | | | | | | | | | | | | | There is no need to pass fd as a second parameter. Additionally remove unneeded curly braces. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: Replace s1 with ctx for consistency.Giorgio Vazzana2014-09-05
| | | | | | | | | | | | No functional change in the code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavdevice/v4l2: fix descriptors leak on error pathsDmitry Volyntsev2014-09-04
| | | | | | | | | | | | | | Signed-off-by: Dmitry Volytnsev <xeioexception@gmail.com> Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Reviewed-by: Giorgio Vazzana <mywing81@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/x11grab: fix error handling in pixel formatsMichael Niedermayer2014-09-04
| | | | | | | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'Michael Niedermayer2014-09-03
|\| | | | | | | | | | | | | | | | | | | * commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d': x11grab: Refactor pixel format parsing Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Refactor pixel format parsingLuca Barbato2014-09-03
| |
* | Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'Michael Niedermayer2014-09-03
|\| | | | | | | | | | | | | * commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc': x11grab: Fallback to normal XImage if SHM is not supported Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Fallback to normal XImage if SHM is not supportedLuca Barbato2014-09-03
| |
* | xv.c: Add missing const to lookup table.Reimar Döffinger2014-08-30
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add missing "const" all over the place.Reimar Döffinger2014-08-29
| | | | | | | | | | | | Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'Michael Niedermayer2014-08-28
|\| | | | | | | | | | | | | | | | | | | * commit '58396e806c65fe0eb00e6ccf1980f810cdceed05': x11grab: Use a typedef for the context, as most other code does Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Use a typedef for the context, as most other code doesLuca Barbato2014-08-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'Michael Niedermayer2014-08-28
|\| | | | | | | | | | | | | | | | | | | | | * commit '7bb505a33ca131906b2ceb2f298e104c862740ea': x11grab: Drop a spurious space in the extension reporting message Conflicts: libavdevice/x11grab.c See: 9af209712099699d717596f55b08b3bac8b6b563 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Drop a spurious space in the extension reporting messageLuca Barbato2014-08-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'Michael Niedermayer2014-08-28
|\| | | | | | | | | | | | | | | | | | | * commit '20e82b41fcad23ebbb18d89948aebfcc53921198': x11grab: Small near-cosmetic refactorings Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Small near-cosmetic refactoringsLuca Barbato2014-08-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'Michael Niedermayer2014-08-28
|\| | | | | | | | | | | | | | | | | | | * commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8': x11grab: K&R formatting cosmetics Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: K&R formatting cosmeticsLuca Barbato2014-08-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * pulse: Set the wallclock option as defaultLuca Barbato2014-08-27
| |
* | bktr: Fix Fabrice's nameTimothy Gu2014-08-27
| | | | | | | | | | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> This file with the incorrect name was added after the name was fixed in all other files. This is thus fixing a mistake Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734'Michael Niedermayer2014-08-26
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ab56fabe6294524e99815451ad01e4ff50c6d734': vfwcap: Add fallback define for HWND_MESSAGE The merged commit reverts the HWND_MESSAGE removial, and adds a #ifndef around commit 8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2 vfwcap: Drop fallback VfW defines The defines were added long ago when MinGW still lacked them. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vfwcap: Add fallback define for HWND_MESSAGEDiego Biurrun2014-08-25
| | | | | | | | Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition.
* | Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'Michael Niedermayer2014-08-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '424b929b5cb9ca4094099f25179829260d4b0fa3': pulse: Add a wallclock option to be compatible with other other captures Conflicts: libavdevice/pulse_audio_dec.c wallclock mode was supported and default in FFmpeg already before this commit. its thus left the default Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pulse: Add a wallclock option to be compatible with other other capturesLuca Barbato2014-08-24
| | | | | | | | | | | | alsa and x11grab use av_gettime() to report timestamps. Bug-Id: 647
* | Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'Michael Niedermayer2014-08-19
|\| | | | | | | | | | | | | | | | | | | * commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2': vfwcap: Drop fallback VfW defines Conflicts: libavdevice/vfwcap.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vfwcap: Drop fallback VfW definesDiego Biurrun2014-08-19
| | | | | | | | The defines were added long ago when MinGW still lacked them.
* | gdigrab: fix gdi object leak if using mouserogerdpack2014-08-19
| | | | | | | | | | | | | | based on patch from hlszl1983@163.com Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/pulse_audio_dec: use default source when no input providedLukasz Marek2014-08-18
| | | | | | | | | | | | | | | | | | PulseAudio expilitly requires name of the source. This patch makes it use default source when not provided. It simplifies programistic use. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 02:28:55 +0000