c054cff87a
Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'
...
* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788':
xcbgrab: Move NULL check before pointer dereference
Conflicts:
libavdevice/xcbgrab.c
See: e86df0206f
2014-12-19 05:14:38 +01:00
9e06327ecb
xcbgrab: Move NULL check before pointer dereference
...
Bug-Id: CID 1254668
2014-12-18 23:27:14 +01:00
b3311f3cc9
lavd/alsa-audio-common: mark default device in device list
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-12-14 23:55:41 +01:00
279412c833
lavd/avdevice: use better option types for caps options
...
Using dedicated types allows to use format/layout names,
not just raw int values.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-12-14 23:55:41 +01:00
eb725235b0
avdevice/v4l2: use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-12 14:46:46 +01:00
81a045fe17
Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'
...
* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33':
xcbgrab: Support empty filename string correctly
Conflicts:
libavdevice/xcbgrab.c
See: 62eca2f827
2014-12-10 12:33:37 +01:00
2c3f29c489
xcbgrab: Support empty filename string correctly
...
Bug-Id: CID 1254664
CC: libav-stable@libav.org
2014-12-10 01:45:50 +01:00
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
7502e1a3b7
Fix xcb 32bit pix_fmts: There is no screen transparency.
2014-12-08 00:31:01 +01:00
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
963aa1daf8
Fix standalone compilation of the iec61883 input device.
2014-12-04 01:35:47 +01:00
868cec5874
avdevice/decklink_common: fix COM initialization failure check
...
Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-03 18:47:24 +01:00
5a57f389f4
avdevice/decklink_common: fix heap corruption run time error
...
Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-03 00:41:10 +01:00
cb58c771ad
fix Makefile objects for pulseaudio support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-28 21:30:43 +01:00
0167fa0060
msvc: Fix compilation errors due to header include order.
...
Ensures that the header include order is such that winsock2.h is always
included before windows.h or that windows.h does not include winsock.h.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-27 12:40:18 +01:00
1f3d478898
avdevice/decklink_common: Fix "Cross-compiling FFmpeg on Debian for Windows with MinGW-w64"
...
Fixes Ticket4130
Requested and Tested by: Zeranoe
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-25 04:40:49 +01:00
60420fa3dc
avdevice/dshow: fix build, ensure that feature enable #defines are set before includes
...
dshow_capture.h sets up various flags before including windows headers
this must occur before other headers (like os_support.h) include these
headers without the setup
This could be fixed differently but for now this fixes building on mingw
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-25 04:02:48 +01:00
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
8e6a44cfc5
avdevice/iec61883: Use av_freep(), avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-22 18:44:35 +01:00
6995be43ae
avdevice/avdevice.c: Use av_freep(), avoid leaving stale pointers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-21 18:03:11 +01:00
883f85fa8f
avdevice/fbdev_common: Use av_freep(), avoid leaving stale pointers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-21 18:02:41 +01:00
c05310d469
avdevice/pulse_audio_common: Use av_freep(), avoid leaving stale pointers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-21 18:02:01 +01:00
afbaa9a737
avdevice/oss_audio: avoid strerror() and errbuf
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-17 23:46:56 +01:00
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
2045334239
lavd/avfoundation: Introduce device alias 'none' to allow the user to record 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-14 18:28:12 +01:00
0ea54d698b
lavd/avfoundation: Remove unused -frame_rate option.
2014-11-12 09:55:11 +01:00
b776113e5d
v4l2: Unify one instance of reading/storing errno
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-11-11 10:07:20 +02:00
48c29883fc
lavd/avfoundation: Use internal av_strtok instead of std lib strtok
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-10 21:02:53 +01:00
715ccc2bc4
Merge commit '09f25533a564eab743f258d168697a11122914c4'
...
* commit '09f25533a564eab743f258d168697a11122914c4':
v4l2: Preserve errno values
Conflicts:
libavdevice/v4l2.c
See: 60950adc18
2014-11-10 01:37:08 +01:00
d99653c9e4
Merge commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478'
...
* commit 'a1a259881fa7b23e2ffc0c2a43d4923fe42d0478':
v4l2: Use av_strerror
Conflicts:
libavdevice/v4l2.c
See: 60950adc18
2014-11-10 01:19:24 +01:00
09f25533a5
v4l2: Preserve errno values
...
av_log usually resets it.
2014-11-09 12:59:32 +01:00
a1a259881f
v4l2: Use av_strerror
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-11-09 12:29:59 +01:00
6f21fb7932
Revert "v4l2: setting device parameters early"
...
This reverts commit b1ad931233#3517
Conflicts:
libavdevice/v4l2.c
Requested-by: Giorgio Vazzana <mywing81@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-08 12:43:50 +01:00
be0356ca05
lavd/v4l2: use pixel format variable names consistently
...
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-06 15:39:41 +01:00
4fd7067987
v4l2: support MPEG4 compressed streams
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-05 19:15:14 +01:00
fe72622819
lavd/alsa: implement get_device_list callbacks
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-01 01:02:02 +01:00
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
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
8c0ae9015a
Fix xcbgrab build if shm is not available.
2014-10-30 10:05:45 +01:00
66b2a3fa31
Merge commit '2cd28693a59050717cb7da6cb229e606b1dee356'
...
* commit '2cd28693a59050717cb7da6cb229e606b1dee356':
jack: Use av_strerror
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29 21:59:30 +01:00
7729f43312
avdevice/fbdev_dec: use errno instead of ret for av_log
...
Should fix printing the wrong value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-29 21:44:19 +01:00
265c4771cc
Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'
...
* commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e':
fbdev: Use av_strerror
Conflicts:
libavdevice/fbdev_dec.c
See: f6b56b1f26
2014-10-29 21:43:25 +01:00
2cd28693a5
jack: Use av_strerror
2014-10-29 16:54:43 +00:00
043ea6f7bf
fbdev: Use av_strerror
2014-10-29 16:54:43 +00:00
931da6a5e9
lavd/v4l2: don't use avpriv_ prefix for internal functions
...
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-29 16:12:14 +01:00
b608fba672
Use v4l2 input format automatically if filename starts with "/dev/video"
...
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
2014-10-29 01:59:25 +01:00
280da99a8f
avdevice/xcbgrab: set avclass category
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-28 12:07:20 +01:00
4ad1eba011
lavd: fix building x11grab after a6674d2
2014-10-28 07:22:00 +01:00
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
ed2e97ce6a
lavd/avfoundation: Fix compilation for non MAC OS devices by conditional compilation of screen capture capabilities.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-27 16:38:19 +01:00
a6674d2e77
xcbgrab: XCB-based screen capture
...
Matches the x11grab screen capture by features.
2014-10-26 08:47:41 +01:00
a6555f88aa
lavd/avfoundation: Add support for screen capturing.
...
Patch based on pull-request by Joseph Benden <joe@benden.us>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25 22:09:06 +02:00
a630969535
avdeviece: Read errno before av_log() as the callback from av_log() might affect errno
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25 13:28:51 +02:00
6aa1cfed0b
lavd/fbdev_common: report error during probing fbdev device
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-21 22:57:32 +02:00
da833a6d09
lavd/fbdev_dec: use default device when not provided
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-21 22:57:32 +02:00
e493814d61
lavd: export all symbols with av_ prefix
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-20 22:01:36 +02:00
837605704d
Merge commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82'
...
* commit 'b7c77912b62163b3b46ce93fe42fff3c83604c82':
oss_audio: use a macro to simplify ioctl() error checking
Conflicts:
libavdevice/oss_audio.c
See: 69c7aad494
2014-10-18 23:22:33 +02:00
b7c77912b6
oss_audio: use a macro to simplify ioctl() error checking
...
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-18 16:15:10 +01:00
345160a9cd
Merge commit '2a5ac99e6e06078713f684fee2466c91f677b303'
...
* commit '2a5ac99e6e06078713f684fee2466c91f677b303':
x11grab: Check the XQueryPointer return value
Conflicts:
libavdevice/x11grab.c
See: 69c34a6ac9
2014-10-05 03:42:55 +02:00
8e5be0fffe
Merge commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489'
...
* commit '5b9c817dc7577b6d44acc94d73b9c77c52cda489':
x11grab: Check XFixesGetCursorImage return value
Conflicts:
libavdevice/x11grab.c
See: a65c0a3fe8a65c0a3fe8
2014-10-05 03:22:55 +02:00
98baa8151a
Merge commit '89fa2b5616274194d90bde0aeebf6adbd1245193'
...
* commit '89fa2b5616274194d90bde0aeebf6adbd1245193':
x11grab: Check for XFixes availability at runtime
See: a65c0a3fe8
2014-10-05 03:14:35 +02:00
2a5ac99e6e
x11grab: Check the XQueryPointer return value
...
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-04 23:46:46 +02:00
5b9c817dc7
x11grab: Check XFixesGetCursorImage return value
...
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-04 23:46:46 +02:00
89fa2b5616
x11grab: Check for XFixes availability at runtime
2014-10-04 23:46:46 +02:00
dd16a0d8cc
lavd/avfoundation: Add basic PCM audio support.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-28 02:31:38 +02:00
f2254e36c0
lavd/avfoundation: Use microseconds as common timebase.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 12:13:57 +02:00
1ea7a3e04e
lavd/avfoundation: Simplify debug message generation.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 05:05:31 +02:00
92827e1869
lavd/avfoundation: Using the actual stream index instead of hardcoded value.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 05:05:11 +02:00
a69c70e148
lavd/avfoundation: Split adding a device and getting the device configuration into separate functions.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-26 04:18:24 +02:00
9f0ba52f34
Skip decklink_common_c.h when running make checkheaders.
2014-09-23 22:51:36 +02:00
f3aaec781a
avdevice/version: bump minor for the decklink input
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-22 03:25:22 +02:00
bac6cfcb3a
avdevice: add decklink input support
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-22 02:55:24 +02:00
a5e040ee3c
avdevice/decklink: move general code of decklink encoder to common file
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-22 01:39:50 +02:00
52c85b194b
avdevice/lavfi: dont assign variables to themselfs
...
Fixes "warning: explicitly assigning a variable of type int to itself"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-13 22:32:21 +02:00
69c34a6ac9
avdevice/x11grab: fix cursor drawing in multi-screen setup
...
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>
2014-09-09 02:22:06 +02:00
5a8e51f661
avdevice/x11grab: rename the "w" Window to "root" in paint_mouse_pointer
...
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>
2014-09-09 02:22:01 +02:00
d7e088849e
lavd/v4l2: introduce enqueue_buffer()
...
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>
2014-09-06 00:05:59 +02:00
0b890425e3
lavd/v4l2: simplify list_formats()
...
We can avoid passing file descriptor fd explicitely.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 20:25:58 +02:00
7865cafec2
lavd/v4l2: simplify list_framesizes()
...
We can avoid passing file descriptor fd explicitely.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 18:52:34 +02:00
55cf7d9713
lavd/v4l2: remove unneeded variable in device_init()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 18:43:28 +02:00
3da359c140
lavd/v4l2: simplify first_field()
...
There is no need to pass fd as a second parameter. Additionally remove
unneeded curly braces.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 18:36:04 +02:00
39750b7364
lavd/v4l2: Replace s1 with ctx for consistency.
...
No functional change in the code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-05 18:10:42 +02:00
fe8f4c71e3
libavdevice/v4l2: fix descriptors leak on error paths
...
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>
2014-09-04 13:52:44 +02:00
4f63d6d3b5
avdevice/x11grab: fix error handling in pixel formats
...
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-04 13:42:53 +02:00
7509a95656
Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'
...
* commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d':
x11grab: Refactor pixel format parsing
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 13:58:41 +02:00
33bf66af02
Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'
...
* commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc':
x11grab: Fallback to normal XImage if SHM is not supported
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-03 13:30:24 +02:00
65e78a2e4b
x11grab: Refactor pixel format parsing
2014-09-03 02:38:03 +02:00
bb3ead7e54
x11grab: Fallback to normal XImage if SHM is not supported
2014-09-03 02:38:03 +02:00
8c63a0d171
xv.c: Add missing const to lookup table.
...
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-30 18:02:45 +02:00
d9e2aceb7f
Add missing "const" all over the place.
...
Only "./configure --enable-gpl" on x86 was tested.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2014-08-29 18:57:25 +02:00
c6a3b00924
Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'
...
* 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>
2014-08-28 22:06:48 +02:00
1fc3963188
Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'
...
* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
x11grab: Drop a spurious space in the extension reporting message
Conflicts:
libavdevice/x11grab.c
See: 9af2097120
2014-08-28 21:51:34 +02:00
65c9e2d003
Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'
...
* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
x11grab: Small near-cosmetic refactorings
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 21:39:19 +02:00
5393c9dadd
Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'
...
* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
x11grab: K&R formatting cosmetics
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-28 21:21:47 +02:00
58396e806c
x11grab: Use a typedef for the context, as most other code does
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28 15:49:05 +02:00
7bb505a33c
x11grab: Drop a spurious space in the extension reporting message
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28 15:46:56 +02:00
20e82b41fc
x11grab: Small near-cosmetic refactorings
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28 15:20:12 +02:00
f07a4290a0
x11grab: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-28 14:58:48 +02:00
25cb697d0c
bktr: Fix Fabrice's name
...
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>
2014-08-27 19:17:58 +02:00
404731bd20
pulse: Set the wallclock option as default
2014-08-27 12:36:59 +02:00
d5ee74e57d
Merge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734'
...
* commit 'ab56fabe6294524e99815451ad01e4ff50c6d734':
vfwcap: Add fallback define for HWND_MESSAGE
The merged commit reverts the HWND_MESSAGE removial, and adds a #ifndef around
commit 8bc52dbd9d
2014-08-26 12:22:55 +02:00
ab56fabe62
vfwcap: Add fallback define for HWND_MESSAGE
...
Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition.
2014-08-25 16:41:22 -07:00
511398031c
Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'
...
* 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>
2014-08-24 21:33:59 +02:00
424b929b5c
pulse: Add a wallclock option to be compatible with other other captures
...
alsa and x11grab use av_gettime() to report timestamps.
Bug-Id: 647
2014-08-24 14:04:49 +02:00
c18a3b3e8e
Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'
...
* commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2':
vfwcap: Drop fallback VfW defines
Conflicts:
libavdevice/vfwcap.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-19 18:33:46 +02:00
ea97859c8c
gdigrab: fix gdi object leak if using mouse
...
based on patch from hlszl1983@163.com
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-19 16:07:28 +02:00
8bc52dbd9d
vfwcap: Drop fallback VfW defines
...
The defines were added long ago when MinGW still lacked them.
2014-08-19 06:22:07 -07:00
96602f4e34
lavd/pulse_audio_dec: use default source when no input provided
...
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>
2014-08-18 22:36:46 +02:00
c5f43c8888
avdevice/v4l2: try to fix build for openbsd
...
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-18 14:03:03 +02:00
44e95a017c
lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns ENODATA
...
As of September 14 2012, v4l_enumstd() will return ENODATA
when a device's std field is set to 0. That is, the device
does not have a standard format. In order to properly
handle this case, v4l2_set_parameters should catch the
ENODATA code and break instead of failing.
Below is the v4l2-core commit describing this change.
>>commit a5338190efc7cfa8c99a6856342a77d21c9a05cf
>>Author: Hans Verkuil <hans.verkuil@cisco.com>
>>Date: Fri Sep 14 06:45:43 2012 -0300
>>
>> [media] v4l2-core: tvnorms may be 0 for a given input, handle that case
>>
>> Currently the core code looks at tvnorms to see whether ENUMSTD
>> or G_PARM should be enabled. This is not a good check for drivers
>> that support the STD API on one input and the DV Timings API on another.
>> In that case tvnorms may be 0.
>> Instead check whether s_std is present (for ENUMSTD) or whether g_std or
>> current_norm is present for g_parm.
>> Also, in the enumstd core function return ENODATA if tvnorms is 0,
>> because in that case the current input does not support the STD API
>> and ENUMSTD should return ENODATA for that.
>>
>> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
>> Reviewed-by: Sakari Ailus <sakari.ailus@iki.fi>
>> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2014-08-18 09:20:00 +02:00
fb33bff990
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
...
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 21:00:50 +02:00
3eba0a9190
Merge commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2'
...
* commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2':
vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 12:45:35 +02:00
f929ab0569
cosmetics: Write NULL pointer equality checks more compactly
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-15 03:18:18 -07:00
a6a27fede9
vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()
2014-08-15 09:53:02 +02:00
a57ece0cb4
Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'
...
* commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8':
Bump major versions of all libraries.
Conflicts:
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h
libavutil/version.h
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 00:26:45 +02:00
1985c2e75c
Bump major versions of all libraries.
2014-08-09 16:58:33 +00:00
75bd83d448
avdevice/lavfi: Simplify non-AV stream check
...
Fixes a clang warning
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 15:41:17 +02:00
1fd880cef3
lavd/dshow: use av_codec_get_id()
...
ff_codec_get_id() is a lavf internal function
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 13:03:17 +02:00
0ab00a75e4
avcodec/raw: add avpriv_get_raw_pix_fmt_tags()
...
Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 12:52:38 +02:00
5b12b4fc4b
lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()
...
The were wrongly being exported and used by libavdevice
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 04:28:11 +02:00
86b7821e29
lavd/avfoundation: Add device category.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-05 01:36:26 +02:00
39133efc1b
avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but continue
...
Found-by: CSA and Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-31 21:19:15 +02:00
fcb11ec291
v4l2enc: adding AVClass
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-31 18:59:20 +02:00
1e51af13c7
avdevice/pulse_audio_enc: use getter function for AVFrame.channels
...
This is required by the API/ABI for things outside libavutil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-28 20:06:11 +02:00
b6a6459a24
lavd/lavfi: work with non-mappable files for graph_file option
...
Example of non-mappable file is /dev/stdin. Previously passing it as
graph_file value returned error.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-23 18:42:41 +02:00
80acedae3e
Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'
...
* commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e':
oss_audio: Split muxer and demuxer
Conflicts:
libavdevice/Makefile
libavdevice/oss_audio.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-19 13:39:12 +02:00
69c7aad494
oss_audio: use a macro to simplify ioctl() error checking
...
Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is
available.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-19 03:38:31 +02:00
d6e1d37100
oss_audio: Split muxer and demuxer
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-18 15:04:25 -07:00
f6ed5df9c0
Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'
...
* commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46':
avdevice: Give names to anonymously typedeffed structs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-18 21:48:37 +02:00
c0de9159a7
avdevice: Give names to anonymously typedeffed structs
...
Anonymous structs can cause trouble in header files, so try to
avoid them altogether as a matter of good style.
2014-07-18 07:43:36 -07:00
8e2976860f
lavd/x11grab: reindent after last commit.
2014-07-17 18:28:58 +02:00
1d12df1ad7
lavd/x11grab: add an option to disable MIT-SHM.
...
With remote displays supporting the MIT-SHM extension,
the extension is detected and used, but attaching fails
asynchronously.
2014-07-17 18:12:15 +02:00
16c6795465
lavd/x11grab: check 32-bits color masks.
...
The X11 servers by VNC, at 32-bits depths, has the following masks:
R:0x000007ff G:0x003ff800 B:0xffc00000
This is not compatible with AV_PIX_FMT_0RGB32, and the result
is success with completely wrong colors.
2014-07-17 18:11:56 +02:00
36fbe3c789
lavd/x11grab: change error code for unsupported visuals.
2014-07-17 18:11:55 +02:00
a65c0a3fe8
lavd/x11grab: disable drawing mouse without XFixes.
...
Fix a segfault if the XFixes extension is not available on
the X11 server.
Can be reproduced using the VNC server.
2014-07-17 18:11:55 +02:00
04980dbee8
avdevice/avfoundation: kCVPixelFormatType_OneComponent8 only exists from 10.8 onward
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-16 00:40:32 +02:00
9514472904
avutil & avdevice: remove av_bprint_fd_contents()
...
MSVC does not allow passing file pointers between libs
This API can thus not work with MSVC and as it was very recently added
and its it was in no release its removial should not cause any problems
A better API will be implemented, but its not finished yet, this revert is
to avoid potentially blocking the release
Found-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-15 21:49:56 +02:00
98eab98159
avdevice/pulse_audio_dec: reimplement using the non simple API
...
This fixes timestamps
Based-on: code from pulseaudio
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-09 01:36:01 +02:00
eee6ad38f9
avdevice/lavfi: add io.h, should fix msvc build
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 20:29:59 +02:00
0dbcecc8dc
avdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h>
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 02:48:51 +02:00
0ebcf87803
protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches
...
Should fix build failure on MSVC
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-08 01:54:30 +02:00
2229a6dfe6
avdevice/lavfi: allow non-mmappable files for graph_file
...
Use av_bprint_fd_contents() instead of av_file_map()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-07 21:28:25 +02:00
33f6ba9c4e
avdevice/pulse_audio_dec: clear pa_simple pointer after deallocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-03 13:05:58 +02:00
9efa7f82ce
avdevice/xv: fix missing {
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30 21:32:19 +02:00
e5c806fd67
lavd/xv: handle delete window message
...
User may close X11 window by close button on tray.
FFmpeg leaves in graceless way.
This commit detects it and return EPIPE error.
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30 19:20:32 +02:00
ffe6ecc418
lavd/avfoundation: Support user selected pixel formats and pixel format autoselection.
...
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-12 21:31:25 +02:00
3a10bf93b5
avdevice/lavfi: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07 15:04:50 +02:00
88f2586adb
fix various typos
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 10:58:19 -08:00
124c94a1c8
avdevice/v4l2: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-22 15:08:12 +02:00
51bad41a13
lavd/jack_audio: use av_fifo_alloc_array
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-05-20 00:00:44 +02:00
Michael Niedermayer
Vittorio Giovara
Lukasz Marek
Luca Barbato
Carl Eugen Hoyos
Daniel Moran
Jonathan Baecker
Michael Stypa
Matthew Oliver
Boris Reisig
Thilo Borgmann
Martin Storsjö
Tristan Matthews
Giorgio Vazzana
Andrey Utkin
James Almer
Anton Khirnov
Timothy Gu
Antonio Ospite
Deti Fliegl
Dmitry Volyntsev
Reimar Döffinger
Diego Biurrun
rogerdpack
Andre Wolokita
Gabriel Dume
Anshul Maheswhwari
Andrey Utkin
Nidhi Makhijani
Nicolas George
Hanspeter Niederstrasser
sfan5
Lou Logan