summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '762ab2de6ead68cfe6617d1960921878ddece9e1'James Almer2017-11-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '762ab2de6ead68cfe6617d1960921878ddece9e1': Remove dv1394 input device avfoundation: Drop silly _dec suffix from filename alsa: Coalesce source files after outdev removal oss: Coalesce source files after outdev removal sndio: Coalesce source files after outdev removal This commit is a noop, see 56d2154b72fba96a65b806ecf4a6f85c3f69b021 Merged-by: James Almer <jamrial@gmail.com>
| * Remove dv1394 input deviceJosh de Kock2017-10-13
| | | | | | | | | | | | | | | | Support for this device has been removed in the Linux kernel since v2.6.37. dv1394 has been superseded by libiec61883 which is functionally equivalent. Signed-off-by: Josh de Kock <josh@itanimul.li> Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * avfoundation: Drop silly _dec suffix from filenameDiego Biurrun2017-10-13
| |
| * alsa: Coalesce source files after outdev removalDiego Biurrun2017-10-13
| |
| * oss: Coalesce source files after outdev removalDiego Biurrun2017-10-13
| |
| * sndio: Coalesce source files after outdev removalDiego Biurrun2017-10-13
| |
* | doc/libav-merge: mention skipped outdev removal commitJames Almer2017-11-11
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '8e7e042d41ac42f01d5573a4b0f7d9060356bd46'James Almer2017-11-11
|\| | | | | | | | | | | | | | | | | * commit '8e7e042d41ac42f01d5573a4b0f7d9060356bd46': Remove all output devices This commit is a noop. Such a change needs consensus from the project. Merged-by: James Almer <jamrial@gmail.com>
| * Remove all output devicesDiego Biurrun2017-10-13
| | | | | | | | | | | | The libavformat API is not suitable for exporting output devices as muxers. Some practical problems are e.g. lack of timing/synchronization mechanisms or interaction with output-specific features.
* | Merge commit 'eb3c1a94adbc28411610167d3dac583436e50125'James Almer2017-11-11
|\| | | | | | | | | | | | | | | | | * commit 'eb3c1a94adbc28411610167d3dac583436e50125': pictor: Correctly check frame dimensions This commit is a noop, see 8c2ea3030af7b40a3c4275696fb5c76cdb80950a Merged-by: James Almer <jamrial@gmail.com>
| * pictor: Correctly check frame dimensionsMichael Niedermayer2017-10-12
| | | | | | | | | | | | | | | | | | | | | | Fixes: 559/clusterfuzz-testcase-6424225917173760 Bug-Id: CVE-2017-7862 CC: libav-stable@libav.org Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 8c2ea3030af7b40a3c4275696fb5c76cdb80950a) Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed': makedef: Add support for identifying the ARM64 machine type Merged-by: James Almer <jamrial@gmail.com>
| * makedef: Add support for identifying the ARM64 machine typeMartin Storsjö2017-10-12
| | | | | | | | | | | | | | | | Since this machine type is 5 chars while the existing ones only were 3 (which the regexp assumed), the regexp has to be extended a little. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a': configure: Add a comment about why we don't try to enable pic on arm on target_os=win32 Merged-by: James Almer <jamrial@gmail.com>
| * configure: Add a comment about why we don't try to enable pic on arm on ↵Martin Storsjö2017-10-12
| | | | | | | | | | | | target_os=win32 Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '0ca66409911e9fba940424be8bdfa54e056b0a4b'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit '0ca66409911e9fba940424be8bdfa54e056b0a4b': configure: Don't add -fPIC to asflags when targeting windows Merged-by: James Almer <jamrial@gmail.com>
| * configure: Don't add -fPIC to asflags when targeting windowsMartin Storsjö2017-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | On X86 windows, asflags weren't actually ever used for anything, since assembling used x86asflags instead, and that flags list had -DPIC already. This fixes building shared libraries with clang for arm/aarch64 windows. (This wasn't an issue when in msvc mode before, since we don't try to enable pic at all there, since the msvc armasm assembler fails on our pic constructs there.) Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f951837ce58e8588b175fb53a76fd453a81528ec'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit 'f951837ce58e8588b175fb53a76fd453a81528ec': configure: Don't add -fPIC to cflags for target_os=win32 Merged-by: James Almer <jamrial@gmail.com>
| * configure: Don't add -fPIC to cflags for target_os=win32Martin Storsjö2017-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We skipped adding it to cflags for mingw/cygwin configurations where the compiler either complains loudly or even errors out; do the same for target_os=win32, for the case when building with clang in msvc mode. This wasn't needed for the actual msvc before, since msvc uses msvc_common_flags to filter out this flag from cflags. When building with clang in msvc mode, no such filter is used. This fixes building shared libraries with clang in msvc mode. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c': build: CryptGenRandom --> wincrypt, it is a better name Merged-by: James Almer <jamrial@gmail.com>
| * build: CryptGenRandom --> wincrypt, it is a better nameDiego Biurrun2017-10-12
| |
* | Merge commit '93797681c2310faeeb0158f66f471965213904c6'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit '93797681c2310faeeb0158f66f471965213904c6': build: Rename stdatomic_h variable to stdatomic Merged-by: James Almer <jamrial@gmail.com>
| * build: Rename stdatomic_h variable to stdatomicDiego Biurrun2017-10-12
| | | | | | | | It does not represent a header but a complete system capability.
* | Merge commit '62d5b5a9d3b0181335072d6fa792f2d805bc27b6'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit '62d5b5a9d3b0181335072d6fa792f2d805bc27b6': configure: Extend check_header() to allow checking for multiple headers Merged-by: James Almer <jamrial@gmail.com>
| * configure: Extend check_header() to allow checking for multiple headersDiego Biurrun2017-10-12
| | | | | | | | Also use that new capability to simplify bktr header checks.
* | Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f': build: Merge mach/mach_time.h and mach_absolute_time() checks Merged-by: James Almer <jamrial@gmail.com>
| * build: Merge mach/mach_time.h and mach_absolute_time() checksDiego Biurrun2017-10-12
| |
* | Merge commit '4f6401df43d7ee9082ea591037b9f9284217d834'James Almer2017-11-11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '4f6401df43d7ee9082ea591037b9f9284217d834': configure: Merge separate parts of GnuTLS test configure: Simplify nvenc check (and move it to the correct spot) configure: Drop fallback for deprecated avserver command line options configure: Drop feature for randomly disabling/enabling components This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * configure: Merge separate parts of GnuTLS testDiego Biurrun2017-10-12
| |
| * configure: Simplify nvenc check (and move it to the correct spot)Diego Biurrun2017-10-12
| |
| * configure: Drop fallback for deprecated avserver command line optionsDiego Biurrun2017-10-12
| |
| * configure: Drop feature for randomly disabling/enabling componentsDiego Biurrun2017-10-12
| | | | | | | | This feature was never used for anything.
* | Merge commit '010baac12a14d684a1ae72f6b7509e642c40f3b3'James Almer2017-11-11
|\| | | | | | | | | | | | | | | | | * commit '010baac12a14d684a1ae72f6b7509e642c40f3b3': configure: Fix stupid typo in gsm.h header name This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * configure: Fix stupid typo in gsm.h header nameDiego Biurrun2017-10-11
| |
* | Merge commit '76481f57b528168b00035aee76f7e0878669011f'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit '76481f57b528168b00035aee76f7e0878669011f': configure: Remove pointless empty *_COMPONENTS variables Merged-by: James Almer <jamrial@gmail.com>
| * configure: Remove pointless empty *_COMPONENTS variablesDiego Biurrun2017-10-10
| |
* | Merge commit '1c047c8f4d5e016e89250afdeb88a4fea707cc1c'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit '1c047c8f4d5e016e89250afdeb88a4fea707cc1c': configure: Drop stray extralibs for libspeex Merged-by: James Almer <jamrial@gmail.com>
| * configure: Drop stray extralibs for libspeexDiego Biurrun2017-10-10
| | | | | | | | These extralibs are set by pkg-config already.
* | Merge commit '3e5950287317938e6b81e7ef8f024b403c303289'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit '3e5950287317938e6b81e7ef8f024b403c303289': configure: Drop unused attribute checks Merged-by: James Almer <jamrial@gmail.com>
| * configure: Drop unused attribute checksDiego Biurrun2017-10-10
| |
* | Merge commit '421c10ed4fb0475a2cb055dd130ba12a6adb9f70'James Almer2017-11-11
|\| | | | | | | | | | | | | | | | | * commit '421c10ed4fb0475a2cb055dd130ba12a6adb9f70': configure: Drop test for fork() We keep the check as it's needed by the http_multiclient example. Merged-by: James Almer <jamrial@gmail.com>
| * configure: Drop test for fork()Diego Biurrun2017-10-10
| | | | | | | | fork() is never used conditionally.
* | Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784': build: Drop redundant check for soundcard.h Merged-by: James Almer <jamrial@gmail.com>
| * build: Drop redundant check for soundcard.hDiego Biurrun2017-10-10
| | | | | | | | It should be sys/soundcard.h nowadays.
* | Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'James Almer2017-11-11
|\| | | | | | | | | | | | | | | | | * commit '8e97a8c69162afce47abea96c8c0914f3550e212': build: Remove check for gsm/gsm.h for libgsm Also includes fix from 010baac12a14d684a1ae72f6b7509e642c40f3b3 Merged-by: James Almer <jamrial@gmail.com>
| * build: Remove check for gsm/gsm.h for libgsmDiego Biurrun2017-10-10
| | | | | | | | | | | | libgsm never installed more than a single header, the headers installed into the gsm/ subdirectory by some distros are private. Who started this nonsense is a mystery, but it got cargo-culted around ever since.
* | Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit '29ccc641b17afad058a5c24071ea827865a8b3a9': build: Drop check for sys/mman.h in favor of mmap() check Merged-by: James Almer <jamrial@gmail.com>
| * build: Drop check for sys/mman.h in favor of mmap() checkDiego Biurrun2017-10-10
| | | | | | | | We already rely on just mmap() in other places.
* | Merge commit 'e7168d4c0cb279cf267690549ca92ad564572bc6'James Almer2017-11-11
|\| | | | | | | | | | | | | * commit 'e7168d4c0cb279cf267690549ca92ad564572bc6': configure: Drop redundant header check for d3d11.h Merged-by: James Almer <jamrial@gmail.com>
| * configure: Drop redundant header check for d3d11.hDiego Biurrun2017-10-10
| | | | | | | | It is detected as a part of the ID3D11VideoDecoder check.