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
2014-11-14lavd/avfoundation: Introduce device alias 'none' to allow the user to record ↵Thilo Borgmann
only audio or video. Changes the selection of a default device to none instead of the system default device. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-12lavd/avfoundation: Remove unused -frame_rate option.Carl Eugen Hoyos
2014-11-10lavd/avfoundation: Use internal av_strtok instead of std lib strtokThilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10Merge commit '09f25533a564eab743f258d168697a11122914c4'Michael Niedermayer
* commit '09f25533a564eab743f258d168697a11122914c4': v4l2: Preserve errno values Conflicts: libavdevice/v4l2.c See: 60950adc18fe145a235211e75da68ab07123fcaa Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10Merge commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478'Michael Niedermayer
* commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478': v4l2: Use av_strerror Conflicts: libavdevice/v4l2.c See: 60950adc18fe145a235211e75da68ab07123fcaa Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-09v4l2: Preserve errno valuesLuca Barbato
av_log usually resets it.
2014-11-09v4l2: Use av_strerrorTristan Matthews
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-11-08Revert "v4l2: setting device parameters early"Michael Niedermayer
This reverts commit b1ad9312331759679a9c956233716a67ae681d89. Fixes Ticket #3517 Conflicts: libavdevice/v4l2.c Requested-by: Giorgio Vazzana <mywing81@gmail.com> Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-06lavd/v4l2: use pixel format variable names consistentlyGiorgio Vazzana
We now use 'pixelformat' for V4L2_PIX_FMT_* (as they do in v4l2 documentation) and 'pix_fmt' for AVPixelFormat. No functional change in the code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-05v4l2: support MPEG4 compressed streamsAndrey Utkin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-01lavd/alsa: implement get_device_list callbacksLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
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-29Merge commit '2cd28693a59050717cb7da6cb229e606b1dee356'Michael Niedermayer
* commit '2cd28693a59050717cb7da6cb229e606b1dee356': jack: Use av_strerror Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29avdevice/fbdev_dec: use errno instead of ret for av_logMichael Niedermayer
Should fix printing the wrong value Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'Michael Niedermayer
* commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e': fbdev: Use av_strerror Conflicts: libavdevice/fbdev_dec.c See: f6b56b1f26a1e40a47d85d24b42cd5475cd3b04f Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29jack: Use av_strerrorLuca Barbato
2014-10-29fbdev: Use av_strerrorLuca Barbato
2014-10-29lavd/v4l2: don't use avpriv_ prefix for internal functionsJames Almer
No need to keep the old symbols around until a major bump since lavd functions with the avpriv_ prefix were never exposed. Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29Use v4l2 input format automatically if filename starts with "/dev/video"Andrey Utkin
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2014-10-28avdevice/xcbgrab: set avclass categoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28lavd: fix building x11grab after a6674d2Anton Khirnov
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-27lavd/avfoundation: Fix compilation for non MAC OS devices by conditional ↵Thilo Borgmann
compilation of screen capture capabilities. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26xcbgrab: XCB-based screen captureLuca Barbato
Matches the x11grab screen capture by features.
2014-10-26lavd/avfoundation: Add support for screen capturing.Thilo Borgmann
Patch based on pull-request by Joseph Benden <joe@benden.us> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25avdeviece: Read errno before av_log() as the callback from av_log() might ↵Michael Niedermayer
affect errno Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-22lavd/fbdev_common: report error during probing fbdev deviceLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-22lavd/fbdev_dec: use default device when not providedLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-21lavd: export all symbols with av_ prefixLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-19Merge commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82'Michael Niedermayer
* commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82': oss_audio: use a macro to simplify ioctl() error checking Conflicts: libavdevice/oss_audio.c See: 69c7aad494683953e833e8622776e3bbcc7921ed Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18oss_audio: use a macro to simplify ioctl() error checkingTimothy Gu
Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is available. CC: libav-stable@libav.org Bug-Id: CID 1238992 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-10-05Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303'Michael Niedermayer
* commit '2a5ac99e6e06078713f684fee2466c91f677b303': x11grab: Check the XQueryPointer return value Conflicts: libavdevice/x11grab.c See: 69c34a6ac986e31b5286a1d566617ec25b93e6a7 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05Merge commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489'Michael Niedermayer
* 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>
2014-10-05Merge commit '89fa2b5616274194d90bde0aeebf6adbd1245193'Michael Niedermayer
* commit '89fa2b5616274194d90bde0aeebf6adbd1245193': x11grab: Check for XFixes availability at runtime See: a65c0a3fe822386be30fd3371af9f0d008b02874 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-05x11grab: Check the XQueryPointer return valueAntonio Ospite
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>
2014-10-05x11grab: Check XFixesGetCursorImage return valueLuca Barbato
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
2014-10-05x11grab: Check for XFixes availability at runtimeLuca Barbato
2014-09-28lavd/avfoundation: Add basic PCM audio support.Thilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26lavd/avfoundation: Use microseconds as common timebase.Thilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26lavd/avfoundation: Simplify debug message generation.Thilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26lavd/avfoundation: Using the actual stream index instead of hardcoded value.Thilo Borgmann
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26lavd/avfoundation: Split adding a device and getting the device ↵Thilo Borgmann
configuration into separate functions. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-24Skip decklink_common_c.h when running make checkheaders.Carl Eugen Hoyos
2014-09-22avdevice/version: bump minor for the decklink inputMichael Niedermayer
Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-22avdevice: add decklink input supportDeti Fliegl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-22avdevice/decklink: move general code of decklink encoder to common fileDeti Fliegl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-14avdevice/lavfi: dont assign variables to themselfsMichael Niedermayer
Fixes "warning: explicitly assigning a variable of type int to itself" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09avdevice/x11grab: fix cursor drawing in multi-screen setupAntonio Ospite
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>