summaryrefslogtreecommitdiffstats
path: root/libavdevice
Commit message (Collapse)AuthorAgeFilesLines
* lavd/v4l2: introduce enqueue_buffer()Giorgio Vazzana2014-09-061-18/+21
| | | | | | | | 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>
* lavd/v4l2: simplify list_formats()Giorgio Vazzana2014-09-051-3/+3
| | | | | | We can avoid passing file descriptor fd explicitely. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/v4l2: simplify list_framesizes()Giorgio Vazzana2014-09-051-3/+3
| | | | | | We can avoid passing file descriptor fd explicitely. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/v4l2: remove unneeded variable in device_init()Giorgio Vazzana2014-09-051-3/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/v4l2: simplify first_field()Giorgio Vazzana2014-09-051-7/+5
| | | | | | | There is no need to pass fd as a second parameter. Additionally remove unneeded curly braces. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavd/v4l2: Replace s1 with ctx for consistency.Giorgio Vazzana2014-09-051-57/+57
| | | | | | No functional change in the code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavdevice/v4l2: fix descriptors leak on error pathsDmitry Volyntsev2014-09-041-17/+20
| | | | | | | 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>
* avdevice/x11grab: fix error handling in pixel formatsMichael Niedermayer2014-09-041-1/+4
| | | | | Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'Michael Niedermayer2014-09-031-75/+71
|\ | | | | | | | | | | | | | | | | | | * commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d': x11grab: Refactor pixel format parsing Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Refactor pixel format parsingLuca Barbato2014-09-031-60/+57
| |
* | Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'Michael Niedermayer2014-09-031-26/+34
|\ \ | |/ | | | | | | | | | | * commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc': x11grab: Fallback to normal XImage if SHM is not supported Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Fallback to normal XImage if SHM is not supportedLuca Barbato2014-09-031-26/+34
| |
* | xv.c: Add missing const to lookup table.Reimar Döffinger2014-08-301-2/+2
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Add missing "const" all over the place.Reimar Döffinger2014-08-292-2/+2
| | | | | | | | | | | | Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'Michael Niedermayer2014-08-281-10/+10
|\ \ | |/ | | | | | | | | | | | | | | | | * 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>
| * x11grab: Use a typedef for the context, as most other code doesLuca Barbato2014-08-281-10/+10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'Michael Niedermayer2014-08-281-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '7bb505a33ca131906b2ceb2f298e104c862740ea': x11grab: Drop a spurious space in the extension reporting message Conflicts: libavdevice/x11grab.c See: 9af209712099699d717596f55b08b3bac8b6b563 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Drop a spurious space in the extension reporting messageLuca Barbato2014-08-281-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'Michael Niedermayer2014-08-281-17/+9
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '20e82b41fcad23ebbb18d89948aebfcc53921198': x11grab: Small near-cosmetic refactorings Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: Small near-cosmetic refactoringsLuca Barbato2014-08-281-20/+15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'Michael Niedermayer2014-08-281-134/+139
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8': x11grab: K&R formatting cosmetics Conflicts: libavdevice/x11grab.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: K&R formatting cosmeticsLuca Barbato2014-08-281-136/+142
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * pulse: Set the wallclock option as defaultLuca Barbato2014-08-271-1/+1
| |
* | bktr: Fix Fabrice's nameTimothy Gu2014-08-271-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'ab56fabe6294524e99815451ad01e4ff50c6d734'Michael Niedermayer2014-08-261-0/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'ab56fabe6294524e99815451ad01e4ff50c6d734': vfwcap: Add fallback define for HWND_MESSAGE The merged commit reverts the HWND_MESSAGE removial, and adds a #ifndef around commit 8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2 vfwcap: Drop fallback VfW defines The defines were added long ago when MinGW still lacked them. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vfwcap: Add fallback define for HWND_MESSAGEDiego Biurrun2014-08-251-0/+5
| | | | | | | | Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition.
* | Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'Michael Niedermayer2014-08-241-1/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * pulse: Add a wallclock option to be compatible with other other capturesLuca Barbato2014-08-241-0/+5
| | | | | | | | | | | | alsa and x11grab use av_gettime() to report timestamps. Bug-Id: 647
* | Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'Michael Niedermayer2014-08-191-6/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2': vfwcap: Drop fallback VfW defines Conflicts: libavdevice/vfwcap.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vfwcap: Drop fallback VfW definesDiego Biurrun2014-08-191-8/+0
| | | | | | | | The defines were added long ago when MinGW still lacked them.
* | gdigrab: fix gdi object leak if using mouserogerdpack2014-08-191-0/+6
| | | | | | | | | | | | | | based on patch from hlszl1983@163.com Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/pulse_audio_dec: use default source when no input providedLukasz Marek2014-08-181-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | avdevice/v4l2: try to fix build for openbsdMichael Niedermayer2014-08-181-1/+5
| | | | | | | | | | Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns ENODATAAndre Wolokita2014-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-151-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-151-3/+3
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2'Michael Niedermayer2014-08-151-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2': vfwcap: Replace deprecated av_destruct_packet() by av_free_packet() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vfwcap: Replace deprecated av_destruct_packet() by av_free_packet()Diego Biurrun2014-08-151-1/+1
| |
* | Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'Michael Niedermayer2014-08-101-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Bump major versions of all libraries.Anton Khirnov2014-08-091-1/+1
| |
* | avdevice/lavfi: Simplify non-AV stream checkMichael Niedermayer2014-08-071-8/+4
| | | | | | | | | | Fixes a clang warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/dshow: use av_codec_get_id()James Almer2014-08-071-3/+5
| | | | | | | | | | | | | | 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>
* | avcodec/raw: add avpriv_get_raw_pix_fmt_tags()James Almer2014-08-071-1/+1
| | | | | | | | | | | | | | Used to expose ff_raw_pix_fmt_tags[] to other libav* libraries Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()James Almer2014-08-071-4/+4
| | | | | | | | | | | | | | The were wrongly being exported and used by libavdevice Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/avfoundation: Add device category.Thilo Borgmann2014-08-051-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but ↵Michael Niedermayer2014-07-311-0/+3
| | | | | | | | | | | | | | continue Found-by: CSA and Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | v4l2enc: adding AVClassAnshul Maheswhwari2014-07-311-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/pulse_audio_enc: use getter function for AVFrame.channelsMichael Niedermayer2014-07-281-1/+1
| | | | | | | | | | | | This is required by the API/ABI for things outside libavutil Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/lavfi: work with non-mappable files for graph_file optionAndrey Utkin2014-07-231-15/+15
| | | | | | | | | | | | | | Example of non-mappable file is /dev/stdin. Previously passing it as graph_file value returned error. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'Michael Niedermayer2014-07-195-211/+324
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e': oss_audio: Split muxer and demuxer Conflicts: libavdevice/Makefile libavdevice/oss_audio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud