649c158e8c
Add FFMPEG_VERSION into the binary libs
...
This simplifies identifying from which revision a binary of a lib came from
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 19:32:40 +01:00
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
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