summaryrefslogtreecommitdiffstats
path: root/libavdevice/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'Derek Buitenhuis2016-05-091-2/+2
|\ | | | | | | | | | | | | * commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec': build: miscellaneous cosmetics Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * build: miscellaneous cosmeticsDiego Biurrun2016-04-071-2/+2
| | | | | | | | | | | | Restore alphabetical order in lists, break overly long lines, do some prettyprinting, add some explanatory section comments, group parts together that belong together logically.
* | Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'Derek Buitenhuis2016-04-171-1/+1
|\ \ | |/ | | | | | | | | | | * commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4': timefilter-test: Only compile timefilter-test if JACK is enabled Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * timefilter-test: Only compile timefilter-test if JACK is enabledDiego Biurrun2016-03-231-1/+1
| |
| * avfoundation: Simple captureAlexandre Lision2015-11-261-0/+1
| | | | | | | | | | | | | | Originally based on the capture written by Thilo Borgmann <thilo.borgmann@mail.de>. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avdevice: Mark decklink_common.h as unconditional SKIPHEADERTimothy Gu2016-01-241-1/+2
| | | | | | | | It is a C++ file, incompatible with the checkheaders infrastructure.
* | Merge commit '8d26c193fb42d08602ac93ece039d4718d029adc'Michael Niedermayer2015-04-091-11/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avdevice: Apply a more consistent file naming schemeDiego Biurrun2015-04-091-11/+9
| |
| * lavd: fix building x11grab after a6674d2Anton Khirnov2014-10-281-1/+1
| |
* | dshow: introduce support for crossbar [multiple input selectable] devicesrogerdpack2015-01-231-1/+1
| | | | | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
* | lavd/avdevice: introduce helper functions for sink/sources listingLukasz Marek2015-01-111-0/+1
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | fix Makefile objects for pulseaudio supportMichael Stypa2014-11-281-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'Michael Niedermayer2014-10-271-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * xcbgrab: XCB-based screen captureLuca Barbato2014-10-261-1/+2
| | | | | | | | Matches the x11grab screen capture by features.
* | Skip decklink_common_c.h when running make checkheaders.Carl Eugen Hoyos2014-09-231-1/+2
| |
* | avdevice: add decklink input supportDeti Fliegl2014-09-221-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avdevice/decklink: move general code of decklink encoder to common fileDeti Fliegl2014-09-221-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd6e1d37100af568211f28ec0bcf7958a3a2a299e'Michael Niedermayer2014-07-191-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-181-2/+2
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | 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.
* | Add AVFoundation input device.Thilo Borgmann2014-04-111-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add Win32 GDI-based screen grabbingCalvin Walton2014-04-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on original code by Christophe Gisquet in 2010, updated to work with current ffmpeg APIs. Supports grabbing a single window or an area of the screen, including support for multiple monitors (Windows does funky stuff with negative coordinates here). I've moved most of the configuration to AVOptions; the input file name is now only the string "desktop", or "title=<windowname>" to select a single window. The AVOptions are the same as x11grab where possible. Code has been added to support a "show_region" mode, like x11grab, which will draw a rectangle on the screen around the area being captured. Instead of duplicating code for paletted image handling, I make use of the GDI API's ability to output DIB (BMP) images, which can be run through ffmpeg's existing BMP decoder. Signed-off-by: Calvin Walton <calvin.walton@kepstin.ca> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd: Add QTKit input device.Vadim Kalinsky2014-03-301-0/+1
| | | | | | | | | | Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/Makefile: Add fbdev_common.h to SKIPHEADERSJames Almer2014-03-061-0/+2
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Add decklink_enc.h to SKIPHEADERS.Carl Eugen Hoyos2014-02-191-0/+1
| | | | | | | | Fixes make checkheaders without decklink headers.
* | lavd: add decklink output deviceRamiro Polla2014-02-091-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd: add opengl deviceLukasz Marek2014-01-271-0/+1
| | | | | | | | | | | | It can render to OpenGL context provided by application or into SDL window Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* | Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'Michael Niedermayer2013-12-091-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'd64341e498fa46c6cf4c23d408177d7489559654': configure: Prefix libc-related variables with "libc_" Conflicts: libavdevice/Makefile libavformat/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * configure: Prefix libc-related variables with "libc_"Diego Biurrun2013-12-091-2/+2
| | | | | | | | Simplifies host/target libc detection splitting.
* | Add Windows resource file support for shared librariesJames Almer2013-12-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally written by James Almer <jamrial@gmail.com> With the following contributions by Timothy Gu <timothygu99@gmail.com> * Use descriptions of libraries from the pkg-config file generation function * Use "FFmpeg Project" as CompanyName (suggested by Alexander Strasser) * Use "FFmpeg" for ProductName as MSDN says "name of the product with which the file is distributed" [1]. * Use FFmpeg's version (N-xxxxx-gxxxxxxx) for ProductVersion per MSDN [1]. * Only build the .rc files when --enable-small is not enabled. [1] http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058.aspx Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/fbdev: move common code to separate fileLukasz Marek2013-10-241-2/+4
| | | | | | | | | | | | | | Move common fbdev dec/enc for separate file. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavd: rename fbdev.c into fbdev_dec.cLukasz Marek2013-10-241-1/+1
| | | | | | | | | | | | | | Rename existing fbdev.c to make it a more meaningful name. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | lavd: add fbdev output deviceLukasz Marek2013-10-241-0/+1
| | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Add pulse_audio_common.h to skipheaders.Carl Eugen Hoyos2013-10-091-0/+1
| | | | | | | | Fixes an error when running make checkheaders.
* | lavd/pulse: move common code to separate fileLukasz Marek2013-10-081-2/+4
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd/pulse: rename pulse.c into pulse_audio_dec.cLukasz Marek2013-10-081-1/+1
| | | | | | | | | | | | | | | | This make name of the file more specific as there is also encoder implementation. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd: pulse audio encoderLukasz Marek2013-10-081-0/+1
| | | | | | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavd: Fix make checkheadersJames Almer2013-08-111-0/+2
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-101-0/+2
|\ \ | |/ | | | | | | | | | | * qatar/master: libavutil: Make avpriv_open a library-internal function on msvcrt Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libavutil: Make avpriv_open a library-internal function on msvcrtMartin Storsjö2013-08-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add one copy of the function into each of the libraries, similarly to what we do for log2_tab. When using static libs, only one copy of the file_open.o object file gets included, while when using shared libraries, each of them get a copy of its own. This fixes DLL builds with a statically linked C runtime, where each DLL effectively has got its own instance of the C runtime, where file descriptors can't be shared across runtimes. On systems not using msvcrt, the function is not duplicated. Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavd: add xv output deviceStefano Sabatini2013-05-301-0/+1
| | | | | | | | | | | | | | | | Based on the work of Jeff Moguillansky <Jeff.Moguillansky@am.sony.com>. See thread: Subject: [FFmpeg-devel] x11 output device for libavdevice Date: Wed, 10 Apr 2013 23:10:47 +0000
* | lavd: add v4l2 outdev.Clément Bœsch2013-05-201-0/+1
| |
* | lavd/v4l2: move pixel format conversion code to a separate place.Clément Bœsch2013-05-201-1/+1
| | | | | | | | This will be shared with the output device.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-291-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (35 commits) h264_idct_10bit: port x86 assembly to cpuflags. x86inc: clip num_args to 7 on x86-32. x86inc: sync to latest version from x264. fft: rename "z" to "zc" to prevent name collision. wv: return meaningful error codes. wv: return AVERROR_EOF on EOF, not EIO. mp3dec: forward errors for av_get_packet(). mp3dec: remove a pointless local variable. mp3dec: remove commented out cruft. lavfi: bump minor to mark stabilizing the ABI. FATE: add tests for yadif. FATE: add a test for delogo video filter. FATE: add a test for amix audio filter. audiogen: allow specifying random seed as a commandline parameter. vc1dec: Override invalid macroblock quantizer vc1: avoid reading beyond the last line in vc1_draw_sprites() vc1dec: check that coded slice positions and interlacing match. vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value configure: Move parts that should not be user-selectable to CONFIG_EXTRA lavf: remove commented out cruft in avformat_find_stream_info() ... Conflicts: Makefile configure libavcodec/vc1dec.c libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264dsp_mmx.c libavfilter/version.h libavformat/mp3dec.c libavformat/utils.c libavformat/wv.c libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x11grab: cosmetics: consistent naming for x11grab-related thingsDiego Biurrun2012-07-281-1/+1
| |
* | libcaca output devicePaul B Mahol2012-07-211-0/+1
| |
* | FireWire DV/HDV input device using libiec61883Georg Lippitsch2012-07-051-0/+1
| | | | | | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-07-041-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) lavfi: reclassify showfiltfmts as a TESTPROG graph2dot: fix printf format specifier swscale: yuv2planeX 8bit >=sse2 functions need aligned stack on x86-32. vp8: loopfilter >=sse2 functions need aligned stack on x86-32. amr: remove shift out of the AMR_BIT() macro. dsputilenc: group yasm and inline asm function pointer assignment. mov: use forward declaration of a function instead of a table. Clarify Doxygen comment for FF_API_* #defines. configure: simplify get_version() Create version.h headers for libraries that lack them gitignore: Use full path instead of relative path to specify patterns mpegvideo: remove VLAs Add XTEA encryption support in libavutil Add Blowfish encryption support in libavutil eval: Add the isinf() function and tests for it flacdec: move lpc filter to flacdsp flacdec: split off channel decorrelation as flacdsp avplay: Add an option for not limiting the input buffer size FATE: add a test for WMA cover art. FATE: add a test for apetag cover art ... Conflicts: .gitignore configure ffplay.c libavcodec/Makefile libavcodec/error_resilience.c libavcodec/mpegvideo.c libavcodec/ratecontrol.c libavdevice/avdevice.h libavfilter/Makefile libavfilter/filtfmts.c libavfilter/version.h libavformat/mov.c libavformat/version.h libavutil/Makefile libavutil/avutil.h libavutil/version.h libswscale/swscale.h libswscale/x86/swscale_mmx.c tests/fate/libavutil.mak tests/lavfi-regression.sh tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Create version.h headers for libraries that lack themDiego Biurrun2012-07-041-1/+2
| |
OpenPOWER on IntegriCloud