summaryrefslogtreecommitdiff
path: root/libavdevice
Commit message (Collapse)AuthorAge
* xv.c: Add missing const to lookup table.Reimar Döffinger2014-08-30
| | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Add missing "const" all over the place.Reimar Döffinger2014-08-29
| | | | | | Only "./configure --enable-gpl" on x86 was tested. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'Michael Niedermayer2014-08-28
|\ | | | | | | | | | | | | | | | | | | * 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-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'Michael Niedermayer2014-08-28
|\| | | | | | | | | | | | | | | | | | | | | * 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-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'Michael Niedermayer2014-08-28
|\| | | | | | | | | | | | | | | | | | | * 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-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'Michael Niedermayer2014-08-28
|\| | | | | | | | | | | | | | | | | | | * 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-28
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * pulse: Set the wallclock option as defaultLuca Barbato2014-08-27
| |
* | bktr: Fix Fabrice's nameTimothy Gu2014-08-27
| | | | | | | | | | | | | | | | | | 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-26
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-25
| | | | | | | | Some obsolete versions of the MinGW32 runtime (<4.0.0) lack the definition.
* | Merge commit '424b929b5cb9ca4094099f25179829260d4b0fa3'Michael Niedermayer2014-08-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-24
| | | | | | | | | | | | alsa and x11grab use av_gettime() to report timestamps. Bug-Id: 647
* | Merge commit '8bc52dbd9dffb1b2fa4a6aeed2d298d036b619b2'Michael Niedermayer2014-08-19
|\| | | | | | | | | | | | | | | | | | | * 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-19
| | | | | | | | The defines were added long ago when MinGW still lacked them.
* | gdigrab: fix gdi object leak if using mouserogerdpack2014-08-19
| | | | | | | | | | | | | | 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-18
| | | | | | | | | | | | | | | | | | 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-18
| | | | | | | | | | Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/v4l2: do not fail when VIDIOC_ENUMSTD returns ENODATAAndre Wolokita2014-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'a6a27fede94efe48aad1dcc9d5e000d2de71c7b2'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | * 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-15
| |
* | Merge commit '1985c2e75c607ac51bfd8dc87d2957a5edf2b6f8'Michael Niedermayer2014-08-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-09
| |
* | avdevice/lavfi: Simplify non-AV stream checkMichael Niedermayer2014-08-07
| | | | | | | | | | Fixes a clang warning Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/dshow: use av_codec_get_id()James Almer2014-08-07
| | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | | | 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-07
| | | | | | | | | | | | | | 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-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/oss_audio: Check SNDCTL_DSP_GETFMTS failure, print a warning but ↵Michael Niedermayer2014-07-31
| | | | | | | | | | | | | | continue Found-by: CSA and Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | v4l2enc: adding AVClassAnshul Maheswhwari2014-07-31
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/pulse_audio_enc: use getter function for AVFrame.channelsMichael Niedermayer2014-07-28
| | | | | | | | | | | | 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-23
| | | | | | | | | | | | | | 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-19
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e': oss_audio: Split muxer and demuxer Conflicts: libavdevice/Makefile libavdevice/oss_audio.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oss_audio: Split muxer and demuxerNidhi Makhijani2014-07-18
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | oss_audio: use a macro to simplify ioctl() error checkingTimothy Gu2014-07-19
| | | | | | | | | | | | | | | | Also add a note about SNDCTL_DSP_GETFMTS which may fail even if OSS is available. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46'Michael Niedermayer2014-07-18
|\| | | | | | | | | | | | | * commit 'c0de9159a7ba5707aa0a5c2bc73ae78b7b87ec46': avdevice: Give names to anonymously typedeffed structs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avdevice: Give names to anonymously typedeffed structsDiego Biurrun2014-07-18
| | | | | | | | | | Anonymous structs can cause trouble in header files, so try to avoid them altogether as a matter of good style.
* | lavd/x11grab: reindent after last commit.Nicolas George2014-07-17
| |
* | lavd/x11grab: add an option to disable MIT-SHM.Nicolas George2014-07-17
| | | | | | | | | | | | With remote displays supporting the MIT-SHM extension, the extension is detected and used, but attaching fails asynchronously.
* | lavd/x11grab: check 32-bits color masks.Nicolas George2014-07-17
| | | | | | | | | | | | | | The X11 servers by VNC, at 32-bits depths, has the following masks: R:0x000007ff G:0x003ff800 B:0xffc00000 This is not compatible with AV_PIX_FMT_0RGB32, and the result is success with completely wrong colors.
* | lavd/x11grab: change error code for unsupported visuals.Nicolas George2014-07-17
| |
* | lavd/x11grab: disable drawing mouse without XFixes.Nicolas George2014-07-17
| | | | | | | | | | | | Fix a segfault if the XFixes extension is not available on the X11 server. Can be reproduced using the VNC server.
* | avdevice/avfoundation: kCVPixelFormatType_OneComponent8 only exists from ↵Hanspeter Niederstrasser2014-07-16
| | | | | | | | | | | | 10.8 onward Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil & avdevice: remove av_bprint_fd_contents()Michael Niedermayer2014-07-15
| | | | | | | | | | | | | | | | | | | | | | | | MSVC does not allow passing file pointers between libs This API can thus not work with MSVC and as it was very recently added and its it was in no release its removial should not cause any problems A better API will be implemented, but its not finished yet, this revert is to avoid potentially blocking the release Found-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/pulse_audio_dec: reimplement using the non simple APIMichael Niedermayer2014-07-09
| | | | | | | | | | | | | | | | This fixes timestamps Based-on: code from pulseaudio Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>