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
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
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
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
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
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
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
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
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
7404f3bdb9
lavc: Switch bitrate to 64bit unless compatibility with avconv was requested.
2015-09-15 18:02:43 +02:00
5cae43e718
avdevice/v4l2: use AV_OPT_TYPE_BOOL for use_libv4l2 option
2015-09-12 18:24:49 +02:00
2c364ef82d
avdevice/caca: small trivial macros adjustments
2015-09-12 17:50:22 +02:00
79f0f1a80b
avdevice/caca: remove space before ':' (English typo, cosmetics)
2015-09-12 17:50:21 +02:00
9d0a6ede30
avdevice/caca: use AV_OPT_TYPE_BOOL for list_drivers option
2015-09-12 17:50:20 +02:00
a68d6cf5b4
avdevice/dshow: use AV_OPT_TYPE_BOOL
2015-09-08 22:39:21 +02:00
5d8e836d0e
Replace all remaining occurances of step/depth_minus1 and offset_plus1
2015-09-08 17:10:48 +02:00
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
83a5df54ea
Remove left-over FF_API_DESTRUCT_PACKET cruft
2015-09-05 16:51:53 +02:00
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
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
e88103a7f9
Bump major versions of all libraries
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-08-28 16:04:28 +02:00
01bcc2d5c2
lavc: Drop deprecated destruct_packet related functions
...
Deprecated in 10/2012.
2015-08-28 16:01:16 +02:00
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
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
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
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
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
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
bed1d9ec7a
dshow: show more debug timestamp info
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
2015-07-31 18:30:03 +02:00
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
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
059a934806
lavc: Consistently prefix input buffer defines
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27 15:24:59 +01:00
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
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
e76c34d08c
Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3'
...
* commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3':
fbdev: Support the RGB565 colour space.
Conflicts:
libavdevice/fbdev_dec.c
See: 43d36599fe
2015-07-11 12:25:03 +02:00
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
c8b8271379
xcbgrab: Explicitly include xcb/shape.h
...
Found-By: Cheristheus
2015-07-06 20:00:34 +02:00
0f87f9b4fc
lavd: Add library identifier
2015-07-01 00:13:58 +01:00
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
3323c5f353
Remove a few occurences of "long long" from the libraries.
2015-06-13 09:28:41 +02:00
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
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
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
bc1eace1b3
jack: Check memory allocation
...
CC: libav-stable@libav.org
Bug-Id: CID 1292520
2015-06-08 13:03:27 +01:00
7c453277a3
avdevice/iec61883: Check pthread init for failures
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-07 18:57:55 +02:00
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
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
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
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
23e6cf832f
lavd/v4l2: fix typo
...
This was introduced in cde6e328de
2015-05-08 18:02:28 +02:00
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
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
01fdfa51ac
xcbgrab: Accept geometries matching the screen size
...
Introduced in e8c4db0d4d
2015-05-06 12:25:32 +02:00
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
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
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
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
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
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
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
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
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
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
7a9b764c07
libdc1394: Unbreak build after c201069fa
2015-04-11 10:57:18 +02:00
d4a6c94046
Merge commit '4f373a5111f900af54301907132942f95276285c'
...
* commit '4f373a5111f900af54301907132942f95276285c':
vfwcap: Unbreak building after c201069fa4d0f6d3fb4
2015-04-11 02:19:32 +02:00
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
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
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
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
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
8d26c193fb
avdevice: Apply a more consistent file naming scheme
2015-04-09 16:40:12 +02:00
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
63167a6ba3
avdevice/avfoundation: Fix occured typo
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30 21:41:17 +02:00
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
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
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
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
edca1dd552
xcbgrab: Check av_strdup() allocation
...
Bug-Id: CID 1274038
2015-03-12 15:29:59 +00:00
88bf16895a
lavd/avfoundation: Silence warnings when compiling for iOS.
...
Reviewed-by: Thilo Borgmann
2015-03-10 12:11:15 +01:00
87b3c6e28b
lavd/avfoundation: Silence c99 warnings when using gcc.
...
Reviewed-by: Thilo Borgmann
2015-03-10 12:11:15 +01:00
732f46a675
lavd/qtkit: Silence deprecation warnings when using clang.
...
Reviewed-by: Thilo Borgmann
2015-03-10 12:11:15 +01:00
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
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
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
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
23e483269d
lavd/avfoundation: Add support for 16bit integer input.
...
Reviewed-by: Thilo Borgmann
2015-03-06 01:06:57 +01:00
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
9a26ba9713
v4l2: Add support for h264
2015-03-02 12:07:59 +01:00
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
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
802987f8c7
x11grab: Unbreak building
...
The correct macro is DEC not D. Broken in
b31328d008
2015-02-28 21:51:24 +01:00
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
a1b5cf0181
Merge commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b'
...
* commit '85b3b1c4ba7af9c2658442b0aafd27d613e1854b':
xcbgrab: Unbreak parsing filename options
Conflicts:
libavdevice/xcbgrab.c
See: db442c8736
2015-02-25 01:44:49 +01:00
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
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
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
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
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
Luca Barbato
Ganesh Ajjanagadde
Hendrik Leppkes
Vittorio Giovara
Michael Niedermayer
Clément Bœsch
Andreas Cadhalpun
Ronald S. Bultje
Carl Eugen Hoyos
rogerdpack
Chris Spencer
Dan Flett
Michael Niedermayer
Giorgio Vazzana
Nicolas George
Mate Sebok
Federico Tomassetti
Michael Kostylev
Martin Storsjö
Diego Biurrun
Matthieu Bouron
John Robinson
Christian Hujer
Himangi Saraogi
Daniel Moran
Georg Lippitsch
Stefano Sabatini
Clay McClure
Lukasz Marek
Jonathan Baecker
Michael Stypa
Matthew Oliver
Boris Reisig
Thilo Borgmann
Tristan Matthews
Andrey Utkin
James Almer
Anton Khirnov
Timothy Gu
Antonio Ospite
Deti Fliegl
Dmitry Volyntsev
Reimar Döffinger
Andre Wolokita
Gabriel Dume