e97a9666ef
Merge commit '81ef46020fa654720e3beb4f5551ba634fae262a'
...
* commit '81ef46020fa654720e3beb4f5551ba634fae262a':
bktr: Use av_strerror and propagate error codes
Conflicts:
libavdevice/bktr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-16 02:56:17 +01:00
81ef46020f
bktr: Use av_strerror and propagate error codes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-02-15 13:42:31 -08:00
3171ac209b
Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'
...
* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
xcbgrab: Correctly make shm optional
Conflicts:
libavdevice/xcbgrab.c
See: 8c0ae9015a
2015-02-15 20:42:52 +01:00
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
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
5ae140c04f
avdevice/decklink_common: Use defined(__APPLE__) instead of __APPLE__
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 04:52:52 +01:00
62ea5ae2b5
avdevice/decklink_common: Fix Decklink for Mac
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 04:43:54 +01:00
97a27065c8
avdevice/decklink: 10 Bit support for Decklink input device
...
Example to capture video clip at 1080i50 10 bit:
ffmpeg -bm_v210 1 -f decklink -i 'UltraStudio Mini Recorder@11' -acodec copy -vcodec copy output.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 04:31:27 +01:00
c8bec255ef
lavd/libcdio: add more paranoia mode constants
2015-01-31 11:32:05 +01:00
fbccbd6832
lavd/libcdio: apply minor fixes to options documentation
2015-01-31 11:32:05 +01:00
37984ca133
Merge commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff'
...
* commit '6a808f5ae17f1fcdbcfb18055872c12aef70ffff':
libdc1394: Add support for MONO8 (gray) video mode
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 20:29:29 +01:00
6a808f5ae1
libdc1394: Add support for MONO8 (gray) video mode
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-01-28 16:10:24 +01:00
61974c7dcc
dshow: tweak logging
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-26 02:04:30 -07:00
7c2e262701
dshow: crossbar dialog was frequently being displayed twice, split up option so it can be just once
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-26 01:29:58 -07:00
c55fa2f09b
dshow: add properties dialog for tv tuners
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-26 00:28:26 -07:00
15848c623d
avdevice/dshow_crossbar: Avoid mixing declarations and statements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-24 18:44:40 +01:00
a35da0920d
dshow: some devices only list themselves under "Video sources" but
...
actually have both video and audio output pins, so make the audio pins
accessible by video source name.
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-23 06:54:48 -07:00
5d72cf0f64
dshow: add options for allowing filter popup configuration dialogs to be presented to the user
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-23 06:49:37 -07:00
ec81ad21c1
dshow: introduce support for crossbar [multiple input selectable] devices
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-23 06:35:16 -07:00
b76a0e24f9
dshow: drop initial audio packets with weird timestamps
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-23 06:13:33 -07:00
8eb5b5ec6f
dshow: use non deprecated api
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-23 06:07:24 -07:00
e620eee88c
dshow: miscellaneous tweaks
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-23 06:01:32 -07:00
d01234419b
dshow: allow selecting devices by an alternative name (workaround for devices with symbols in them), allow specifying capture pins by name and alternative (unique) name
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-23 05:38:14 -07:00
48895a23fc
avdevice/alsa-audio-common: Use *alloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 17:00:16 +01:00
bf8bcd3b2b
avdevice/openal-dec: Check the return code of av_new_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 00:34:18 +01:00
fa6c9e54df
avdevice/pulse_audio_dec: remove double ;;
2015-01-18 00:35:04 +01:00
ba97cf2c45
avdevice: Use av_format_get_control_message_cb()
...
This is required as the location of this field could change and is
specified in libavformat not avdevice
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 02:13:01 +01:00
ea0ac11f1b
lavd/v4l2: implement list device callback
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-01-11 18:58:33 +01:00
007c33df0a
lavd/avdevice: introduce helper functions for sink/sources listing
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-01-11 18:58:26 +01:00
9241e544ff
lavd/avdevice: remove av_ prefix from private function
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2015-01-11 18:54:49 +01:00
e5993aeb60
avdevice/lavfi: Use avio_closep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-08 14:11:44 +01:00
55763b6f5e
lavd/lavfi: allow to extract subcc.
...
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-02 20:17:05 +01:00
9c3a8693a2
avdevice/dshow: Remove unneeded NULL checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28 18:17:12 +01:00
a3f6e8c4d9
avdevice/dshow: Use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28 18:16:37 +01:00
beaea2de61
avdevice/dv1394: Use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28 18:16:02 +01:00
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
Michael Niedermayer
Himangi Saraogi
Luca Barbato
Daniel Moran
Georg Lippitsch
Stefano Sabatini
Clay McClure
rogerdpack
Clément Bœsch
Lukasz Marek
Nicolas George
Vittorio Giovara
Carl Eugen Hoyos
Jonathan Baecker
Michael Stypa