Marton Balint
38d75fe906
avdevice/decklink: factorize device finder function
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-06-26 19:17:45 +02:00
Marton Balint
4ce0a77ec8
avdevice/decklink: remove unused itermode iterators
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-06-26 19:17:40 +02:00
Marton Balint
1fc85d8511
avdevice/decklink: factorize cleanup function to common code
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-06-26 19:17:37 +02:00
Marton Balint
340cea9f22
avdevice/decklink_dec: fix bitrate calculations
...
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-06-26 19:17:29 +02:00
rogerdpack
bfbffbd7d8
dshow: avoid duplicate NULL check before free
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-23 03:18:16 +02:00
rogerdpack
9e907c040d
dshow: don't add two instances of same device to graphs
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-23 03:18:16 +02:00
Clément Bœsch
a444a50510
Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'
...
* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
Combine deprecation guards where appropriate
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-22 17:36:42 +02:00
Clément Bœsch
5d48e4eafa
Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'
...
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
tests: Move all test programs to a subdirectory
Merged-by: Clément Bœsch <clement@stupeflix.com>
2016-06-22 13:44:34 +02:00
Clément Bœsch
a4403e49b9
Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'
...
* commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376':
Reduce the scope of some variables
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:40:56 +02:00
Clément Bœsch
8df1dbd798
Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5'
...
* commit '5afb94c817abffad030c6b94d7003dca8aace3d5':
Mark read-only tables as static
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 22:09:35 +02:00
Clément Bœsch
8ef57a0d61
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
...
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 21:55:34 +02:00
Niklas Söderlund
6fd4145a1e
lavd/v4l2: allow devices not implementing VIDIOC_G_PARM
...
Not all v4l2 devices implement the VIDIOC_G_PARM ioctl. This patch allow
ffmpeg to open such device and treat it the same as devices that do
implement the ioctl but returns that it do not implement the
V4L2_CAP_TIMEPERFRAME capability.
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-16 16:27:35 +02:00
Diego Biurrun
a2ddfadc2d
avdevice: Ignore timefilter test program
2016-06-14 11:14:06 +02:00
Michael Niedermayer
584fff9478
avdevice: Fix max value of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-09 10:34:42 +02:00
Michael Niedermayer
e7f658be57
avdevice/dshow: Fix frame rate
...
Fixes: Ticket5526
Tested-by: kgp700
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-07 02:32:13 +02:00
Michael Niedermayer
958bf659d8
avdevice/lavfi: Do not set avg_frame_rate to the timebase
...
Fixes regression
Fixes Ticket5422 (The timebase is 1/25k but the fps are not 25k)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-06-04 02:10:10 +02:00
Diego Biurrun
535a742c26
build: Change structure of the linker version script templates
...
Split version files into one line per symbol/directive to allow compatibility
with the Solaris linker without preprocessing and eliminate $ from version file
templates to simplify the postprocessing shell command.
2016-05-29 16:43:11 +02:00
Diego Biurrun
11de006bab
Combine deprecation guards where appropriate
...
Some code blocks use multiple bits of deprecated API.
2016-05-13 15:14:30 +02:00
Diego Biurrun
a6a750c7ef
tests: Move all test programs to a subdirectory
2016-05-13 14:55:56 +02:00
Derek Buitenhuis
96d616052b
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
...
* commit 'd12b5b2f135aade4099f4b26b0fe678656158c13':
build: Split test programs off into separate files
Some conversions done by: James Almer <jamrial@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-11 19:13:03 +01:00
Diego Biurrun
b7e64fba7f
Reduce the scope of some variables
...
This avoids unused variable warnings after the next version bump.
Also drop a trace level av_log() call that is in the way.
2016-05-11 12:21:25 +02:00
Felt, Patrick
fce7513122
avdevice/decklink_dec: Convert decklink input module to use codecpar
...
There are still a couple of deprecated calls that I’m not sure what to do with.
They are both related to some logic around AVCodecContext.coded_frame.
I couldn’t find anywhere that really documented what that was, or where it was intended to move to.
I left the warnings on.
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-11 01:14:01 +02:00
Derek Buitenhuis
ca5ec2bf51
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
...
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
build: miscellaneous cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-05-09 16:25:28 +01:00
Rick Kern
f1560dbb2a
lavd/avfoundation: use AVCodecParameters
...
Fixes "Could not find codec parameters for stream" error (#5494 )
Signed-off-by: Rick Kern <kernrj@gmail.com>
2016-05-05 16:03:45 +02:00
Diego Biurrun
5afb94c817
Mark read-only tables as static
2016-05-05 10:48:34 +02:00
Vittorio Giovara
41ed7ab45f
cosmetics: Fix spelling mistakes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-05-04 18:16:21 +02:00
Derek Buitenhuis
32c044cbc6
Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'
...
* commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48':
testprogs: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21 16:04:17 +01:00
Derek Buitenhuis
9b36f446ac
Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'
...
* commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4':
timefilter-test: Only compile timefilter-test if JACK is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17 19:37:54 +01:00
Michael Niedermayer
02d08da81f
avdevice/caca: switch to codecpar
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-11 01:34:02 +02:00
Derek Buitenhuis
6f69f7a8bf
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
...
* commit '9200514ad8717c63f82101dc394f4378854325bf':
lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
- Derek Buitenhuis <derek.buitenhuis@gmail.com>
- Hendrik Leppkes <h.leppkes@gmail.com>
- wm4 <nfxjfg@googlemail.com>
- Clément Bœsch <clement@stupeflix.com>
- James Almer <jamrial@gmail.com>
- Michael Niedermayer <michael@niedermayer.cc>
- Rostislav Pehlivanov <atomnuker@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-10 20:59:55 +01:00
Diego Biurrun
d12b5b2f13
build: Split test programs off into separate files
...
This avoids spurious library rebuilds when only the test program
code is changed and simplifies the build system.
2016-04-07 16:14:42 +02:00
Diego Biurrun
01621202aa
build: miscellaneous cosmetics
...
Restore alphabetical order in lists, break overly long lines, do some
prettyprinting, add some explanatory section comments, group parts
together that belong together logically.
2016-04-07 15:26:08 +02:00
Lou Logan
cd76eb8f4a
lavd/dshow_crossbar: remove trailing whitespace
...
Signed-off-by: Lou Logan <lou@lrcd.com>
2016-03-28 13:31:38 -08:00
Diego Biurrun
439929859a
testprogs: Clean up #includes
2016-03-24 19:17:23 +01:00
Diego Biurrun
30e9ef21ce
timefilter-test: Only compile timefilter-test if JACK is enabled
2016-03-23 09:35:41 +01:00
Anton Khirnov
9200514ad8
lavf: replace AVStream.codec with AVStream.codecpar
...
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2016-02-23 17:01:58 +01:00
Josh de Kock
67f8a0be54
configure&avdevice/jack: Fixed issue #43 JACK indev support on OSX
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-22 00:46:49 +01:00
Metaksakis Georgios
00c73c475e
lavd/gdigrab: mouse dpi awareness
...
correct mouse location on hidpi screens.
fixes ticket #5008
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
2016-02-15 10:11:11 +11:00
FearThe1337
c33ffc7b21
libavdevice/dshow.c: Correct CoGetMalloc check
...
Current if statement would always be false due to assigning the value of
S_OK which equals 0.
Signed-off-by: FearThe1337 <git@fearthe1337.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-13 22:57:26 +01:00
Trevor \\\\ Higgins
6632802aa0
x11grab: fixed next frame capture time calculation
...
The next frame time could slip, causing the frame rate to drop until
frames were dropped. Now will capture at the next correct moment instead.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-05 01:11:17 +01:00
Timothy Gu
13b8ba8c9d
xv: Remove AVPicture usage
2016-02-02 18:06:13 -08:00
Timothy Gu
228eb6708b
sdl: Remove AVPicture usage
2016-02-02 18:06:13 -08:00
Matthias Hunstock
e9025573fa
decklink: support all valid numbers of audio channels
...
As it is already written in the documentation, BMD DeckLink cards
are capable of capturing 2, 8 or 16 audio channels (for SDI Inputs).
Currently the value is hardcoded to 2. Introduces new option.
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-02-03 00:34:26 +01:00
Michael Niedermayer
fe3fed0b14
Update demuxers and protocols for protocol whitelist support
...
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-02 04:16:50 +01:00
Paul B Mahol
75f3e5e082
avdevice/lavfi: replace deprecated avpicture_layout
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-02-01 13:12:27 +01:00
Timothy Gu
180f9a0958
all: Make header guard names consistent
2016-01-31 15:44:11 -08:00
Michael Ira Krufky
44a50feebe
libavdevice/decklink_common.h: fix broken build due to missing /
...
Signed-off-by: Michael Ira Krufky <mkrufky@linuxtv.org>
2016-01-29 13:29:47 +01:00
Timothy Gu
44304ae322
all: Add missing header guards
2016-01-28 19:49:48 -08:00
Marton Balint
995c7a6f5a
lavd/decklink_dec: add support for teletext
...
It uses the libzvbi slicer, therefore teletext capture requires libzvbi.
Reviewed-by: Deti Fliegl <deti@fliegl.de>
Signed-off-by: Marton Balint <cus@passwd.hu>
2016-01-29 01:42:15 +01:00
Derek Buitenhuis
21f9468402
avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT
...
Libav, for some reason, merged this as a public API function. This will
aid in future merges.
A define is left for backwards compat, just in case some person
used it, since it is in a public header.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-01-27 16:36:46 +00:00
Timothy Gu
ce36cb08ed
Revert "decklink: Header cleanup"
...
This reverts commit 61fb70c386
.
Reported in #5183 to break the build. Further investigation needed.
2016-01-24 12:42:39 -08:00
Timothy Gu
61fb70c386
decklink: Header cleanup
...
This commit cleans up the decklink files' header usage so that they pass
checkheaders.
2016-01-24 07:31:16 -08:00
Timothy Gu
af54a36fc4
avdevice: Mark decklink_common.h as unconditional SKIPHEADER
...
It is a C++ file, incompatible with the checkheaders infrastructure.
2016-01-24 07:28:18 -08:00
Eddie Hao
a6dc1eb837
remove all uses of the deprecated avpicture_get_size() function
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-01-17 12:01:35 +01:00
Timothy Gu
d64d6edfc7
Correct two build/built typos
...
Found-by: Leo Izen <leo.izen@gmail.com> as thebombzen on IRC
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2016-01-11 20:53:11 -08:00
Ganesh Ajjanagadde
879b4a9d3e
lavd/pulse_audio_enc: replace lround by lrint
...
Here it is mostly a cosmetic change, but there might be benefits in that
there are no compat hacks for lround, while there are for lrint.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-12-21 08:25:30 -08:00
Alexandre Lision
4f979418c7
avfoundation: Simple capture
...
Originally based on the capture written by
Thilo Borgmann <thilo.borgmann@mail.de>.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-11-26 10:55:28 +01:00
Ganesh Ajjanagadde
6f1ddc726f
avdevice/dshow_enummediatypes: check return of av_malloc
...
Untested.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-11-06 09:36:57 -05:00
Matt Oliver
e82883aa88
gdigrab: grab right desktop size if DPI in use, based on patch from Alexander Brotzge
...
Signed-off-by: Matt Oliver <protogonoi@gmail.com>
2015-10-31 23:08:02 +11:00
Michael Niedermayer
865f6f410f
avdevice/caca: change AV_OPT_TYPE_STRING to set .str default
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-31 02:31:40 +01:00
Hendrik Leppkes
c2f861ca42
Replace remaining occurances of av_free_packet with av_packet_unref
2015-10-27 14:35:30 +01:00
Hendrik Leppkes
7f5af80ba4
Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'
...
* commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457':
avpacket: Replace av_free_packet with av_packet_unref
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-27 14:28:56 +01:00
Luca Barbato
ce70f28a17
avpacket: Replace av_free_packet with av_packet_unref
...
`av_packet_unref` matches the AVFrame ref-counted API and can be used as
a drop in replacement.
Deprecate `av_free_packet`.
2015-10-26 18:00:55 +01:00
Ganesh Ajjanagadde
38f4e973ef
all: fix -Wextra-semi reported on clang
...
This fixes extra semicolons that clang 3.7 on GNU/Linux warns about.
These were trigggered when built under -Wpedantic, which essentially
checks for strict ISO compliance in numerous ways.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-24 17:58:17 -04:00
Ganesh Ajjanagadde
a7c5005d7b
avdevice/pulse_audio_common: add av_warn_unused_result
...
This does not trigger any warnings, but adds robustness.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-22 19:03:50 -04:00
Hendrik Leppkes
470204218f
Merge commit 'f890677d05bc4e8b494a73373ab4cc19791bf884'
...
* commit 'f890677d05bc4e8b494a73373ab4cc19791bf884':
Replace any remaining avpicture function with imgutils
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-22 20:48:54 +02:00
Vittorio Giovara
f890677d05
Replace any remaining avpicture function with imgutils
...
avpicture_get_size() -> av_image_get_buffer_size()
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-10-21 11:59:59 +02:00
Ganesh Ajjanagadde
6d0c8cb79a
avdevice/internal: add av_warn_unused_result
...
This does not trigger any warnings but adds robustness.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-16 17:28:40 -04:00
Ganesh Ajjanagadde
5e80a6cd31
avdevice/alsa: add av_warn_unused_result
...
This does not trigger any warnings, but adds robustness.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-10-16 07:54:36 -04:00
Michael Niedermayer
f67170e81b
avdevice/libdc1394: add const to suppress "assignment discards const qualifier from pointer target type" warnings
...
See: http://fate.ffmpeg.org/log.cgi?time=20150919100330&log=compile&slot=x86_64-archlinux-gcc-enableshared
Found-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-20 22:12:37 +02:00
Ganesh Ajjanagadde
6a817ac1e9
avdevice/xcbgrab: fix -Wunused-variable
...
This patch fixes a -Wunused-variable reported in e.g
http://fate.ffmpeg.org/log.cgi?time=20150918194649&log=compile&slot=x86_64-debian-asan-144800 .
av_unused is used as opposed to a header guard for readability.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-19 01:35:43 +02:00
Michael Niedermayer
7404f3bdb9
lavc: Switch bitrate to 64bit unless compatibility with avconv was requested.
2015-09-15 18:02:43 +02:00
Clément Bœsch
5cae43e718
avdevice/v4l2: use AV_OPT_TYPE_BOOL for use_libv4l2 option
2015-09-12 18:24:49 +02:00
Clément Bœsch
2c364ef82d
avdevice/caca: small trivial macros adjustments
2015-09-12 17:50:22 +02:00
Clément Bœsch
79f0f1a80b
avdevice/caca: remove space before ':' (English typo, cosmetics)
2015-09-12 17:50:21 +02:00
Clément Bœsch
9d0a6ede30
avdevice/caca: use AV_OPT_TYPE_BOOL for list_drivers option
2015-09-12 17:50:20 +02:00
Clément Bœsch
a68d6cf5b4
avdevice/dshow: use AV_OPT_TYPE_BOOL
2015-09-08 22:39:21 +02:00
Hendrik Leppkes
5d8e836d0e
Replace all remaining occurances of step/depth_minus1 and offset_plus1
2015-09-08 17:10:48 +02:00
Hendrik Leppkes
160e92c8bf
Merge commit 'e88103a7f92cf27a2868b50acc8a9912f6088249'
...
* commit 'e88103a7f92cf27a2868b50acc8a9912f6088249':
Bump major versions of all libraries
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-05 21:35:46 +02:00
Hendrik Leppkes
83a5df54ea
Remove left-over FF_API_DESTRUCT_PACKET cruft
2015-09-05 16:51:53 +02:00
Hendrik Leppkes
87c8812270
Merge commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8'
...
* commit '01bcc2d5c23fa757d163530abb396fd02f1be7c8':
lavc: Drop deprecated destruct_packet related functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-05 16:50:09 +02:00
Michael Niedermayer
ab800add7b
avdevice/libdc1394: Make dc1394_frame_format and dc1394_frame_rate, static
...
These are not used outside nor are in installed headers
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-30 13:10:11 +02:00
Vittorio Giovara
e88103a7f9
Bump major versions of all libraries
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-08-28 16:04:28 +02:00
Vittorio Giovara
01bcc2d5c2
lavc: Drop deprecated destruct_packet related functions
...
Deprecated in 10/2012.
2015-08-28 16:01:16 +02:00
Ganesh Ajjanagadde
9aaac04107
avdevice/lavfi: fix self assignment warning
...
FAIL(ret) expands to statements including a silly ret=ret.
This triggers a -Wself-assign on confirmed clang 3.6, and so we fix it.
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-23 20:00:03 +02:00
Andreas Cadhalpun
9acf5341d6
openal-dec: replace av_destruct_packet with av_free_packet
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-22 19:16:13 +02:00
Andreas Cadhalpun
c363843a53
add missing FF_API_DESTRUCT_PACKET guards
...
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-22 19:16:13 +02:00
Ronald S. Bultje
229843aa35
Replace av_dlog with ff_dlog.
...
ff_dlog checks compilability, and is non-public. av_dlog is deprecated
and no longer exists if FF_API_DLOG=0.
2015-08-18 10:24:01 -04:00
Andreas Cadhalpun
9126ae4b6b
use avfilter_pad_get_{type,name} accessor functions
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-08 21:59:02 +02:00
Carl Eugen Hoyos
4c4f14c717
lavd/v4l2: Use AVSTREAM_PARSE_FULL_ONCE when reading a h264 stream.
...
Reported, debugged and tested by trac user noah.
Fixes ticket #4644 .
2015-08-04 14:59:26 +02:00
rogerdpack
bed1d9ec7a
dshow: show more debug timestamp info
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-07-31 18:30:03 +02:00
Chris Spencer
9c41126e1b
avdevice/decklink: Fix build error caused by a change in the SDK.
...
In version 10.4 of the DeckLink SDK, GetBufferedAudioSampleFrameCount() was changed to take an unsigned int instead of an unsigned long.
Signed-off-by: Chris Spencer <spencercw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28 05:16:05 +02:00
Michael Niedermayer
29d147c94d
Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'
...
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba':
lavc: Consistently prefix input buffer defines
Conflicts:
doc/examples/decoding_encoding.c
libavcodec/4xm.c
libavcodec/aac_adtstoasc_bsf.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.h
libavcodec/asvenc.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/dvdec.c
libavcodec/ffv1enc.c
libavcodec/g2meet.c
libavcodec/gif.c
libavcodec/h264.c
libavcodec/h264_mp4toannexb_bsf.c
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c
libavcodec/jpeglsenc.c
libavcodec/libxvid.c
libavcodec/mdec.c
libavcodec/motionpixels.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/noise_bsf.c
libavcodec/nuv.c
libavcodec/nvenc.c
libavcodec/options.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/proresenc_kostya.c
libavcodec/qsvdec.c
libavcodec/svq1enc.c
libavcodec/tiffenc.c
libavcodec/truemotion2.c
libavcodec/utils.c
libavcodec/utvideoenc.c
libavcodec/vc1dec.c
libavcodec/wmalosslessdec.c
libavformat/adxdec.c
libavformat/aiffdec.c
libavformat/apc.c
libavformat/apetag.c
libavformat/avidec.c
libavformat/bink.c
libavformat/cafdec.c
libavformat/flvdec.c
libavformat/id3v2.c
libavformat/isom.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/mpc.c
libavformat/mpc8.c
libavformat/mpegts.c
libavformat/mvi.c
libavformat/mxfdec.c
libavformat/mxg.c
libavformat/nutdec.c
libavformat/oggdec.c
libavformat/oggparsecelt.c
libavformat/oggparseflac.c
libavformat/oggparseopus.c
libavformat/oggparsespeex.c
libavformat/omadec.c
libavformat/rawdec.c
libavformat/riffdec.c
libavformat/rl2.c
libavformat/rmdec.c
libavformat/rtpdec_latm.c
libavformat/rtpdec_mpeg4.c
libavformat/rtpdec_qdm2.c
libavformat/rtpdec_svq3.c
libavformat/sierravmd.c
libavformat/smacker.c
libavformat/smush.c
libavformat/spdifenc.c
libavformat/takdec.c
libavformat/tta.c
libavformat/utils.c
libavformat/vqf.c
libavformat/westwood_vqa.c
libavformat/xmv.c
libavformat/xwma.c
libavformat/yop.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27 23:15:19 +02:00
Vittorio Giovara
059a934806
lavc: Consistently prefix input buffer defines
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:59 +01:00
Michael Niedermayer
495eee0123
Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'
...
* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370':
Deprecate avctx.coded_frame
Conflicts:
ffmpeg.c
libavcodec/a64multienc.c
libavcodec/asvenc.c
libavcodec/cljrenc.c
libavcodec/dpxenc.c
libavcodec/gif.c
libavcodec/mpegvideo_enc.c
libavcodec/nvenc.c
libavcodec/proresenc_kostya.c
libavcodec/pthread_frame.c
libavcodec/rawenc.c
libavcodec/sunrastenc.c
libavcodec/tiffenc.c
libavcodec/version.h
libavcodec/xbmenc.c
libavcodec/xwdenc.c
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21 01:17:15 +02:00
Vittorio Giovara
40cf1bbacc
Deprecate avctx.coded_frame
...
The rationale is that coded_frame was only used to communicate key_frame,
pict_type and quality to the caller, as well as a few other random fields,
in a non predictable, let alone consistent way.
There was agreement that there was no use case for coded_frame, as it is
a full-sized AVFrame container used for just 2-3 int-sized properties,
which shouldn't even belong into the AVCodecContext in the first place.
The appropriate AVPacket flag can be used instead of key_frame, while
quality is exported with the new AVPacketSideData quality factor.
There is no replacement for the other fields as they were unreliable,
mishandled or just not used at all.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20 15:06:50 +01:00
Michael Niedermayer
e76c34d08c
Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3'
...
* commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3':
fbdev: Support the RGB565 colour space.
Conflicts:
libavdevice/fbdev_dec.c
See: 43d36599fe
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-11 12:25:03 +02:00
Dan Flett
87f98a2b9d
fbdev: Support the RGB565 colour space.
...
Tested on a Raspberry Pi.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-07-11 10:15:59 +03:00
Luca Barbato
c8b8271379
xcbgrab: Explicitly include xcb/shape.h
...
Found-By: Cheristheus
2015-07-06 20:00:34 +02:00
Vittorio Giovara
0f87f9b4fc
lavd: Add library identifier
2015-07-01 00:13:58 +01:00
Andreas Cadhalpun
28efeb6502
doc: avoid incorrect phrase 'allows to'
...
Also fix typo found by Lou Logan:
Sacrifying -> Sacrificing
Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-06-16 21:48:51 +02:00
Carl Eugen Hoyos
3323c5f353
Remove a few occurences of "long long" from the libraries.
2015-06-13 09:28:41 +02:00
Michael Niedermayer
8ddc415515
avdevice/openal-dec: Make al_format_info const
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-11 00:48:41 +02:00
Michael Niedermayer
913685f552
avdevice/lavfi: do not rescale AV_NOPTS_VALUE in lavfi_read_packet()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-10 00:56:02 +02:00
Michael Niedermayer
77510a9698
Merge commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a'
...
* commit 'bc1eace1b3654c490cb2c226b3c80854244dbb9a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 22:48:14 +02:00
Vittorio Giovara
bc1eace1b3
jack: Check memory allocation
...
CC: libav-stable@libav.org
Bug-Id: CID 1292520
2015-06-08 13:03:27 +01:00
Michael Niedermayer
7c453277a3
avdevice/iec61883: Check pthread init for failures
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-07 18:57:55 +02:00
Clément Bœsch
272f87fc5c
avdevice/x11grab: use av_clip() instead of nested min & max
...
Note: [xy]_off and screen_[wh] variables are int, as well as
X11GrabContext.{width,height,x_off,y_off}.
2015-06-06 13:18:29 +02:00
Michael Niedermayer
f8598cefe9
avdevice/v4l2: Fix vertical alignment in list_formats() output
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-16 14:35:36 +02:00
Michael Niedermayer
d1d8ee5e91
avdevice/v4l2: Try to fix build on netbsd/openbsd
...
Found-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-09 00:27:00 +02:00
Giorgio Vazzana
28f20d2ff4
lavd/v4l2: produce a 0 byte packet when a dequeued buffer is flagged with V4L2_BUF_FLAG_ERROR
...
Fixes ticket #4030 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 22:31:09 +02:00
Giorgio Vazzana
23e6cf832f
lavd/v4l2: fix typo
...
This was introduced in cde6e328de
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-08 18:02:28 +02:00
Michael Niedermayer
bc6f84fff7
avdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-07 01:49:54 +02:00
Nicolas George
7971fa9ce0
lavd/xcbgrab: fix comparison with screen size.
...
Signed-off-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-06 13:33:17 +02:00
Nicolas George
01fdfa51ac
xcbgrab: Accept geometries matching the screen size
...
Introduced in e8c4db0d4d
.
2015-05-06 12:25:32 +02:00
Michael Niedermayer
f5c5aa968c
Merge commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641'
...
* commit 'e8c4db0d4d07738fed716b1d2f20c85aac944641':
xcbgrab: Validate the capture area
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30 22:15:22 +02:00
Michael Niedermayer
dc83733f2b
Merge commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b'
...
* commit '82a10225f817b2612fdd2b23af9d4f0a3408df3b':
xcbgrab: Do not assume the non shm image data is always available
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-30 22:00:10 +02:00
Luca Barbato
e8c4db0d4d
xcbgrab: Validate the capture area
...
And notify why the capture is impossible.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-30 14:10:13 +02:00
Luca Barbato
82a10225f8
xcbgrab: Do not assume the non shm image data is always available
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-30 14:10:13 +02:00
Giorgio Vazzana
00a452a9ad
lavd/v4l2: print buffer flags in case of error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-24 13:25:40 +02:00
Mate Sebok
4d98015dcf
dshow: add capture device save and load
...
Signed-off-by: Mate Sebok <smfinc.org@gmail.com>
Reviewed-by: Roger Pack <rogerdpack2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-22 20:12:36 +02:00
Michael Niedermayer
1c667626bb
Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'
...
* commit '386e2755aab73ae7075f78d92786cb5c5419597a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 12:46:29 +02:00
Michael Niedermayer
40d552dae6
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
...
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
Replace av_dlog with normal av_log at trace level
Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 03:19:47 +02:00
Federico Tomassetti
386e2755aa
jack: Check memory allocation
...
Bug-Id: CID 1265785
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-04-19 23:50:48 +01:00
Vittorio Giovara
1a3eb042c7
Replace av_dlog with normal av_log at trace level
...
This applies to every library where performance is not critical.
2015-04-19 12:41:59 +01:00
Michael Kostylev
7a9b764c07
libdc1394: Unbreak build after c201069fa
2015-04-11 10:57:18 +02:00
Michael Niedermayer
d4a6c94046
Merge commit '4f373a5111f900af54301907132942f95276285c'
...
* commit '4f373a5111f900af54301907132942f95276285c':
vfwcap: Unbreak building after c201069fa
Conflicts:
libavdevice/vfwcap.c
See: 4d0f6d3fb4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-11 02:19:32 +02:00
Martin Storsjö
4f373a5111
vfwcap: Unbreak building after c201069fa
...
These headers can't be included in any arbitrary order.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-11 00:15:47 +03:00
Michael Niedermayer
4d0f6d3fb4
avdevice/vfwcap: revert header reordering from c201069fac
...
This should fix build on vs2013
Found-by: Ferdinand Oeinck <ferdo@bigroses.demon.nl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-10 18:09:26 +02:00
Michael Niedermayer
b1b58310d0
Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'
...
* commit '8d26c193fb42d08602ac93ece039d4718d029adc':
avdevice: Apply a more consistent file naming scheme
Conflicts:
libavdevice/Makefile
libavdevice/alsa.h
libavdevice/alsa_dec.c
libavdevice/alsa_enc.c
libavdevice/sndio_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 21:36:42 +02:00
Michael Niedermayer
259fd4c7cf
avdevice/vfwcap: put the headers back in the order in which they need to be
...
This avoids build failures
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 21:19:49 +02:00
Michael Niedermayer
fe25194c58
Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'
...
* commit 'c201069fac9a76e6604f9d84d76a172434d62200':
avdevice: Add missing header for NULL_IF_CONFIG_SMALL
Conflicts:
libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio-enc.c
libavdevice/pulse_audio_dec.c
libavdevice/sndio_enc.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavdevice/xcbgrab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-09 21:07:24 +02:00
Diego Biurrun
8d26c193fb
avdevice: Apply a more consistent file naming scheme
2015-04-09 16:40:12 +02:00
Diego Biurrun
c201069fac
avdevice: Add missing header for NULL_IF_CONFIG_SMALL
...
Also reshuffle headers into canonical order where appropriate.
2015-04-09 16:40:12 +02:00
Michael Niedermayer
63167a6ba3
avdevice/avfoundation: Fix occured typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 21:41:17 +02:00
Matthieu Bouron
cf16b459a8
libavdevice/avfoundation: use pts/dts provided by the CMSampleBuffer API
...
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29 04:08:33 +02:00
Matthieu Bouron
021b023751
libavdevice/avfoundation: add capture_mouse_clicks option
...
Support mouse clicks capture while recording a screen on OSX >= 10.7.
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29 04:07:43 +02:00
Matthieu Bouron
c908cae74c
libavdevice/avfoundation: add capture_cursor option
...
Add support for cursor capturing while recording a screen for OSX >=
10.8.
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29 03:50:31 +02:00
Matthieu Bouron
573a77a1b6
libavdevice/avfoundation: add framerate and video size options
...
Support framerate ands video size options on AVCaptureDevices for
OSX >= 10.7 and iOS >= 7.0.
For screen captures, only the framerate option is taken into account.
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-29 03:49:38 +02:00
Vittorio Giovara
edca1dd552
xcbgrab: Check av_strdup() allocation
...
Bug-Id: CID 1274038
2015-03-12 15:29:59 +00:00
Carl Eugen Hoyos
88bf16895a
lavd/avfoundation: Silence warnings when compiling for iOS.
...
Reviewed-by: Thilo Borgmann
2015-03-10 12:11:15 +01:00
Carl Eugen Hoyos
87b3c6e28b
lavd/avfoundation: Silence c99 warnings when using gcc.
...
Reviewed-by: Thilo Borgmann
2015-03-10 12:11:15 +01:00
Carl Eugen Hoyos
732f46a675
lavd/qtkit: Silence deprecation warnings when using clang.
...
Reviewed-by: Thilo Borgmann
2015-03-10 12:11:15 +01:00
Michael Niedermayer
3360c6ac0c
Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'
...
* commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8':
xcbgrab: Free the host string after checking the connection
Conflicts:
libavdevice/xcbgrab.c
No change as the bug was not in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-08 19:44:09 +01:00
Luca Barbato
5f5b78aca3
xcbgrab: Free the host string after checking the connection
...
Prevent an use after free in the error message.
Bug-Id: CID 1274040
CC: libav-stable@libav.org
2015-03-08 14:39:01 +01:00
Andreas Cadhalpun
482c86f231
fix spelling errors
...
opttimizations -> optimizations
grabing -> grabbing
many resource -> many resources
isnt -> isn't
silcense -> silence
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-06 21:35:00 +01:00
John Robinson
98d19ca8f1
lavd/avfoundation: Add support for 24 and 32bit integer input.
...
Tested on Mac Mini soundflower and built-in line input.
Reviewed-by: Thilo Borgmann
2015-03-06 01:10:16 +01:00
Carl Eugen Hoyos
23e483269d
lavd/avfoundation: Add support for 16bit integer input.
...
Reviewed-by: Thilo Borgmann
2015-03-06 01:06:57 +01:00
Michael Niedermayer
cde6e328de
Merge commit '619d5e7db88941cadb8136f805564e885c6c6434'
...
* commit '619d5e7db88941cadb8136f805564e885c6c6434':
v4l2: Use the codec descriptor facility
Conflicts:
libavdevice/v4l2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-02 20:16:22 +01:00
Luca Barbato
9a26ba9713
v4l2: Add support for h264
2015-03-02 12:07:59 +01:00
Luca Barbato
619d5e7db8
v4l2: Use the codec descriptor facility
...
The encoder or decoder might be disabled but the format would be
supported for at least remuxing.
2015-03-02 11:27:57 +01:00
Michael Niedermayer
8a77672645
Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'
...
* commit '802987f8c7033ec8b82b35438d3822cf7f761166':
x11grab: Unbreak building
Conflicts:
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-01 00:17:36 +01:00
Christian Hujer
802987f8c7
x11grab: Unbreak building
...
The correct macro is DEC not D. Broken in
b31328d008
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-02-28 21:51:24 +01:00
Nicolas George
a92193f247
lavd/alsa: set frame_size field.
...
The value tells the typical size of a packet from the demuxer.
2015-02-26 19:19:56 +01:00
Michael Niedermayer
a1b5cf0181
Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'
...
* commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b':
xcbgrab: Unbreak parsing filename options
Conflicts:
libavdevice/xcbgrab.c
See: db442c8736
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25 01:44:49 +01:00
Michael Niedermayer
2fbdf30efe
Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'
...
* commit 'b31328d008985f87f0a7c83c700847cef1a4f08c':
xcbgrab: Provide better names for the y and x option
Conflicts:
doc/indevs.texi
libavdevice/x11grab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25 01:12:50 +01:00
Luca Barbato
85b3b1c4ba
xcbgrab: Unbreak parsing filename options
...
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-24 22:31:20 +01:00
Luca Barbato
b31328d008
xcbgrab: Provide better names for the y and x option
...
Incidentally `-y` also collides with avconv global options.
Update x11grab to match and document the option.
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-02-24 22:31:20 +01:00
Michael Niedermayer
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
Himangi Saraogi
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
Michael Niedermayer
3171ac209b
Merge commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42'
...
* commit 'd40815a982c36ff9da09ae3edb5e3bd7d97b5d42':
xcbgrab: Correctly make shm optional
Conflicts:
libavdevice/xcbgrab.c
See: 8c0ae9015a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 20:42:52 +01:00
Luca Barbato
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
Daniel Moran
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
Michael Niedermayer
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
Georg Lippitsch
62ea5ae2b5
avdevice/decklink_common: Fix Decklink for Mac
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-08 04:43:54 +01:00
Georg Lippitsch
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
Stefano Sabatini
c8bec255ef
lavd/libcdio: add more paranoia mode constants
2015-01-31 11:32:05 +01:00
Stefano Sabatini
fbccbd6832
lavd/libcdio: apply minor fixes to options documentation
2015-01-31 11:32:05 +01:00
Michael Niedermayer
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
Clay McClure
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
rogerdpack
61974c7dcc
dshow: tweak logging
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-26 02:04:30 -07:00
rogerdpack
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
rogerdpack
c55fa2f09b
dshow: add properties dialog for tv tuners
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-26 00:28:26 -07:00
Michael Niedermayer
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
rogerdpack
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
rogerdpack
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
rogerdpack
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
rogerdpack
b76a0e24f9
dshow: drop initial audio packets with weird timestamps
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-23 06:13:33 -07:00
rogerdpack
8eb5b5ec6f
dshow: use non deprecated api
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-23 06:07:24 -07:00
rogerdpack
e620eee88c
dshow: miscellaneous tweaks
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-01-23 06:01:32 -07:00
rogerdpack
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
Michael Niedermayer
48895a23fc
avdevice/alsa-audio-common: Use *alloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20 17:00:16 +01:00
Michael Niedermayer
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
Clément Bœsch
fa6c9e54df
avdevice/pulse_audio_dec: remove double ;;
2015-01-18 00:35:04 +01:00
Michael Niedermayer
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
Lukasz Marek
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
Lukasz Marek
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
Lukasz Marek
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
Michael Niedermayer
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
Nicolas George
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
Michael Niedermayer
9c3a8693a2
avdevice/dshow: Remove unneeded NULL checks
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28 18:17:12 +01:00
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
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
Michael Niedermayer
c054cff87a
Merge commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788'
...
* commit '9e06327ecb8f73c7904d10af7ad339c57cdaa788':
xcbgrab: Move NULL check before pointer dereference
Conflicts:
libavdevice/xcbgrab.c
See: e86df0206f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 05:14:38 +01:00
Vittorio Giovara
9e06327ecb
xcbgrab: Move NULL check before pointer dereference
...
Bug-Id: CID 1254668
2014-12-18 23:27:14 +01:00
Lukasz Marek
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
Lukasz Marek
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
Michael Niedermayer
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
Michael Niedermayer
81a045fe17
Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'
...
* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33':
xcbgrab: Support empty filename string correctly
Conflicts:
libavdevice/xcbgrab.c
See: 62eca2f827
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-10 12:33:37 +01:00