summaryrefslogtreecommitdiffstats
path: root/libavdevice
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * oss_audio: Split muxer and demuxerNidhi Makhijani2014-07-185-202/+312
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | oss_audio: use a macro to simplify ioctl() error checkingTimothy Gu2014-07-191-13/+14
| | | | | | | | | | | | | | | | 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-184-4/+4
|\ \ | |/ | | | | | | | | | | * 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-184-4/+4
| | | | | | | | | | 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-171-2/+2
| |
* | lavd/x11grab: add an option to disable MIT-SHM.Nicolas George2014-07-171-1/+4
| | | | | | | | | | | | 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-171-1/+10
| | | | | | | | | | | | | | 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-171-3/+3
| |
* | lavd/x11grab: disable drawing mouse without XFixes.Nicolas George2014-07-171-2/+9
| | | | | | | | | | | | 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-161-0/+2
| | | | | | | | | | | | 10.8 onward Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avutil & avdevice: remove av_bprint_fd_contents()Michael Niedermayer2014-07-151-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | 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-092-54/+235
| | | | | | | | | | | | | | | | 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>
* | avdevice/lavfi: add io.h, should fix msvc buildMichael Niedermayer2014-07-081-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h>Michael Niedermayer2014-07-081-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | protect unistd.h with #if HAVE_UNISTD_H in code from recent ↵Michael Niedermayer2014-07-081-1/+4
| | | | | | | | | | | | | | | | av_bprint_fd_contents() patches Should fix build failure on MSVC Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/lavfi: allow non-mmappable files for graph_fileAndrey Utkin2014-07-071-16/+17
| | | | | | | | | | | | Use av_bprint_fd_contents() instead of av_file_map() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/pulse_audio_dec: clear pa_simple pointer after deallocationMichael Niedermayer2014-07-031-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/xv: fix missing {Michael Niedermayer2014-06-301-1/+1
| | | | | | | | | | Found-by: jamrial Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/xv: handle delete window messageLukasz Marek2014-06-301-0/+16
| | | | | | | | | | | | | | | | | | User may close X11 window by close button on tray. FFmpeg leaves in graceless way. This commit detects it and return EPIPE error. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/avfoundation: Support user selected pixel formats and pixel format ↵sfan52014-06-121-3/+92
| | | | | | | | | | | | | | autoselection. Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/lavfi: Use av_malloc_array()Michael Niedermayer2014-06-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix various typosLou Logan2014-06-031-5/+5
| | | | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/v4l2: Use av_malloc_array()Michael Niedermayer2014-05-221-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/jack_audio: use av_fifo_alloc_arrayLukasz Marek2014-05-201-2/+2
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavd: Use av_gettime_relative()Olivier Langlois2014-05-181-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever av_gettime() is used to measure relative period of time, av_gettime_relative() is prefered as it guarantee monotonic time on supported platforms. Since v4l2 is compiled only on Linux where av_gettime_relative() is monotonic, a small wrapper function av_gettime_monotonic() is used (should be inlined the compiler) to put emphasis on that fact. Signed-off-by: Olivier Langlois <olivier@trillion01.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'Michael Niedermayer2014-05-131-2/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '449511740f06a4675b0066730fa45cdb764ffafc': build: handle library dependencies in configure Conflicts: common.mak configure libavdevice/Makefile libavfilter/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: handle library dependencies in configureJanne Grunau2014-05-131-1/+0
| | | | | | | | | | Instead of setting FFLIBS in each library Makefile configure exports FFLIBS-$library in config.mak.
* | lavd/jack_audio: use av_fifo_freepLukasz Marek2014-05-071-6/+6
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavd/xv: reident after previous commitsLukasz Marek2014-05-021-12/+11
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavd/opengl_enc: fix window size correction codeLukasz Marek2014-05-021-2/+2
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavd/opengl_enc: add window size paramLukasz Marek2014-05-022-3/+14
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavd/opengl_enc: use flag to mark inited contextLukasz Marek2014-05-021-2/+4
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
OpenPOWER on IntegriCloud