1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

88909 Commits

Author SHA1 Message Date
James Almer
48e4eda11d Merge commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24'
* commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24':
  lavc: external hardware frame pool initialization

Includes the fix from e724bdfffb

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 20:33:26 -03:00
James Almer
b125822d1d Merge commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d'
* commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d':
  FATE: add a test for the H.264 sample fixed by 7c4f6f6

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 18:37:54 -03:00
James Almer
fb94e7b39a Revert "Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'"
This reverts commit 1a4315f24d, reversing
changes made to 869401cefc.

At least one distro (Arch) ships gsm.h inside the gsm/ folder
2017-11-11 18:04:22 -03:00
James Almer
8725cf424c Merge commit '98afe3fb71afd4a18009924aaba56bc577bbd400'
* commit '98afe3fb71afd4a18009924aaba56bc577bbd400':
  qsv: Make the hevc idr_interval consistent with the h264 one

This commit is a noop, see 643e336936

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 17:49:35 -03:00
James Almer
5fd3e6c3a6 Merge commit '41df62fd674bd0c67f7b6952381d235a393245d6'
* commit '41df62fd674bd0c67f7b6952381d235a393245d6':
  configure: Set the default assembler to armasm64 for MSVC for arm64

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 17:48:11 -03:00
James Almer
0525722ca0 Merge commit '732510636e597585a79be7d111c88b3f7e174fe7'
* commit '732510636e597585a79be7d111c88b3f7e174fe7':
  aarch64: Remove a dot from a label

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 17:47:10 -03:00
James Almer
529de4f1b6 Merge commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d'
* commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d':
  aarch64: Get rid of a stray double space

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 17:46:48 -03:00
James Almer
17126f1268 Merge commit 'fbd63170bcbc5cad8965edad7c357f6eb4132250'
* commit 'fbd63170bcbc5cad8965edad7c357f6eb4132250':
  cbs: Add test dependencies
  mss1: Add missing macro parameters to ARITH_GET_* macros

This commit is a noop, see
cbeaf67888
809b0402dc

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 17:45:37 -03:00
James Almer
643e336936 Merge commit '077011b5af2b3150efc52a9b58f5ef9bb0235087'
* commit '077011b5af2b3150efc52a9b58f5ef9bb0235087':
  qsv: Expose idr_interval for hevc as well

Also includes 98afe3fb71.

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 17:27:30 -03:00
James Almer
ac36d0c97a doc/libav-merge: mention more skipped outdev removal commits
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-11 17:17:30 -03:00
James Almer
24204eae1c Merge commit '762ab2de6ead68cfe6617d1960921878ddece9e1'
* 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 56d2154b72

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 17:15:09 -03:00
James Almer
e5233b1581 doc/libav-merge: mention skipped outdev removal commit
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-11 17:12:08 -03:00
James Almer
cd95074ff4 Merge commit '8e7e042d41ac42f01d5573a4b0f7d9060356bd46'
* 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>
2017-11-11 17:07:37 -03:00
James Almer
f72ebccb76 Merge commit 'eb3c1a94adbc28411610167d3dac583436e50125'
* commit 'eb3c1a94adbc28411610167d3dac583436e50125':
  pictor: Correctly check frame dimensions

This commit is a noop, see 8c2ea3030a

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 17:03:03 -03:00
James Almer
ab7c8e1d6c Merge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed'
* commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed':
  makedef: Add support for identifying the ARM64 machine type

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:59:36 -03:00
James Almer
1338cc1ac2 Merge commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a'
* 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>
2017-11-11 16:58:15 -03:00
James Almer
ce726e7757 Merge commit '0ca66409911e9fba940424be8bdfa54e056b0a4b'
* commit '0ca66409911e9fba940424be8bdfa54e056b0a4b':
  configure: Don't add -fPIC to asflags when targeting windows

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:56:59 -03:00
James Almer
7e3d6f10f0 Merge commit 'f951837ce58e8588b175fb53a76fd453a81528ec'
* commit 'f951837ce58e8588b175fb53a76fd453a81528ec':
  configure: Don't add -fPIC to cflags for target_os=win32

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:55:43 -03:00
James Almer
3f27200954 Merge commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c'
* commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c':
  build: CryptGenRandom --> wincrypt, it is a better name

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:53:19 -03:00
James Almer
8882e8ad0d Merge commit '93797681c2310faeeb0158f66f471965213904c6'
* commit '93797681c2310faeeb0158f66f471965213904c6':
  build: Rename stdatomic_h variable to stdatomic

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:50:35 -03:00
James Almer
84522ad3fe Merge commit '62d5b5a9d3b0181335072d6fa792f2d805bc27b6'
* commit '62d5b5a9d3b0181335072d6fa792f2d805bc27b6':
  configure: Extend check_header() to allow checking for multiple headers

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:48:49 -03:00
James Almer
4e754e9419 Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'
* commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f':
  build: Merge mach/mach_time.h and mach_absolute_time() checks

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:42:27 -03:00
James Almer
28e012234a Merge commit '4f6401df43d7ee9082ea591037b9f9284217d834'
* 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>
2017-11-11 16:40:20 -03:00
James Almer
d80abb645f Merge commit '010baac12a14d684a1ae72f6b7509e642c40f3b3'
* commit '010baac12a14d684a1ae72f6b7509e642c40f3b3':
  configure: Fix stupid typo in gsm.h header name

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:33:06 -03:00
James Almer
e2989c74dc Merge commit '76481f57b528168b00035aee76f7e0878669011f'
* commit '76481f57b528168b00035aee76f7e0878669011f':
  configure: Remove pointless empty *_COMPONENTS variables

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:31:40 -03:00
James Almer
b9ab980cd9 Merge commit '1c047c8f4d5e016e89250afdeb88a4fea707cc1c'
* commit '1c047c8f4d5e016e89250afdeb88a4fea707cc1c':
  configure: Drop stray extralibs for libspeex

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:30:11 -03:00
James Almer
814e217d14 Merge commit '3e5950287317938e6b81e7ef8f024b403c303289'
* commit '3e5950287317938e6b81e7ef8f024b403c303289':
  configure: Drop unused attribute checks

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:28:42 -03:00
James Almer
08fd6e8e3c Merge commit '421c10ed4fb0475a2cb055dd130ba12a6adb9f70'
* 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>
2017-11-11 16:23:48 -03:00
James Almer
fdd03d2d79 Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'
* commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784':
  build: Drop redundant check for soundcard.h

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:19:50 -03:00
James Almer
1a4315f24d Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'
* commit '8e97a8c69162afce47abea96c8c0914f3550e212':
  build: Remove check for gsm/gsm.h for libgsm

Also includes fix from 010baac12a

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:13:23 -03:00
James Almer
869401cefc Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'
* commit '29ccc641b17afad058a5c24071ea827865a8b3a9':
  build: Drop check for sys/mman.h in favor of mmap() check

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:09:09 -03:00
James Almer
084e7fbe49 Merge commit 'e7168d4c0cb279cf267690549ca92ad564572bc6'
* commit 'e7168d4c0cb279cf267690549ca92ad564572bc6':
  configure: Drop redundant header check for d3d11.h

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:05:45 -03:00
James Almer
1409c2b7ba Merge commit '4064f42889685e7122cfad4934b060098c147753'
* commit '4064f42889685e7122cfad4934b060098c147753':
  build: Drop explicit check for dlfcn.h

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:03:21 -03:00
James Almer
0efdc768eb Merge commit 'fca9ca539c8c6e4fe0072486c7e0479a08a15e7c'
* commit 'fca9ca539c8c6e4fe0072486c7e0479a08a15e7c':
  configure: Drop unused or internally-used entries from variable lists

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 16:00:30 -03:00
James Almer
c584368817 Merge commit '09c98327b9f25c6c1716c0ee82ce09d8b484887a'
* commit '09c98327b9f25c6c1716c0ee82ce09d8b484887a':
  build: Drop support for Tru64 Unix (OSF/1)

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 15:56:27 -03:00
James Almer
8a5e1a4b46 Merge commit 'ab6422e1333e1c8b99e97ac61e3e9b2f6a2b4936'
* commit 'ab6422e1333e1c8b99e97ac61e3e9b2f6a2b4936':
  configure: rename hevc_ps to hevcparse
  extract_extradata: return an error when buffer allocation fails
  cpu: split flag checks per arch in av_cpu_max_align()
  configure: Use test_pkg_config() for the SDL check

This commit is a noop, see
3b345d389b
7bae17e37a

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 15:52:38 -03:00
James Almer
93ccba96df Merge commit 'd66fe7ff53a5cade7a702100a9006dfe5ae1c473'
* commit 'd66fe7ff53a5cade7a702100a9006dfe5ae1c473':
  configure: Add test_pkg_config()

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 15:35:32 -03:00
James Almer
b212eff773 Merge commit '92f0aceb36c6e4412d4cf346e70dc74b5a4069e9'
* commit '92f0aceb36c6e4412d4cf346e70dc74b5a4069e9':
  cinepakenc: Move declaration out of for initialisation statement
  hapdec: Delete include for nonexistent file
  hevc: Fix aligned array declarations

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 15:27:47 -03:00
James Almer
1a24d4f020 Merge commit 'ea25ccd1b2a980df8d43cc1f86a23e3c094090a6'
* commit 'ea25ccd1b2a980df8d43cc1f86a23e3c094090a6':
  qsv: Join the derived session to the parent

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 15:24:08 -03:00
James Almer
8c82c4d25d Merge commit 'ccbb31c14b766ef666ef2daa8c467e478183a957'
* commit 'ccbb31c14b766ef666ef2daa8c467e478183a957':
  qsv: Make sure the session is set with the latest version

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 15:23:49 -03:00
James Almer
0cef66c906 Merge commit '516c479172755c63063180b0c0953b68b670cdbd'
* commit '516c479172755c63063180b0c0953b68b670cdbd':
  checkasm: Test more h264 idct variants

See 2d263188ba

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 15:21:22 -03:00
James Almer
f146441884 Merge commit '3cae7f8b9baaf43789490b676d8f5825f2e1bc2c'
* commit '3cae7f8b9baaf43789490b676d8f5825f2e1bc2c':
  cbs: Add some read/write tests
  http: Reset compressed header flag when starting to read a request
  cbs_h264: Fix writing streams with auxiliary pictures
  smacker: fix integer overflow with pts_inc
  smacker: return meaningful error codes on failure
  pixdesc: Add API to map color property names to enum values

This commit is a noop, see
6f15f1cdc8
547b8aeed4
7ed47e9729
624d4739db
6743351558
809b0402dc

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 15:17:42 -03:00
James Almer
4391d6cb81 Merge commit 'a5a6ac1a123a927e5bed984ed757a29b7ff87dab'
* commit 'a5a6ac1a123a927e5bed984ed757a29b7ff87dab':
  libavfilter/overlay_qsv: Add QSV overlay vpp filter
  libavfilter/vf_vpp: Add common filters of the qsv vpp

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 15:07:06 -03:00
James Almer
64f9188aae Merge commit 'ac6691ab9938107d818cd8066ce3ea329ad14d8d'
* commit 'ac6691ab9938107d818cd8066ce3ea329ad14d8d':
  avio: update avio_alloc_context() doxy

This commit is a noop, see 877076ffa1

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 14:15:45 -03:00
James Almer
3af2bf0af0 Merge commit '10eb496d9ae94df6f792b0e1d8750738eb3a0952'
* commit '10eb496d9ae94df6f792b0e1d8750738eb3a0952':
  vaapi_mpeg2: Convert to use coded bitstream infrastructure
  mpeg12: Move finding the best frame rate to common code
  cbs_mpeg2: Add support for picture display extension
  cbs_h265: Fix ranges of prediction weight offsets
  cbs_h265: Fix reading of unknown parameter set extension data
  vaapi_h264: Fix CPB/DPB delays

This commit is a noop, see
94a4048619
9b0c7aa0e4
686e388bbb
278c308cea
d8928ad6b6

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 14:08:24 -03:00
James Almer
f1fdd17d39 Merge commit 'f940c859c23ae201b0170cf541ea8f6b7a52dd49'
* commit 'f940c859c23ae201b0170cf541ea8f6b7a52dd49':
  Revert "vaapi_h265: Reduce the amount of padding in the stream"

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 14:07:09 -03:00
James Almer
e493ede4ae Merge commit 'c42b62d1f9641f10ffc23cad9abbe47d8a4a165b'
* commit 'c42b62d1f9641f10ffc23cad9abbe47d8a4a165b':
  h264_metadata: Fix double-free
  cbs: Add buffer padding when splitting fragments
  cbs: Always check for bitstream end before reading

This commit is a noop, see
6734eef6b8
b4c915f4b3
a308872b04

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 14:05:59 -03:00
James Almer
d59efe4ca6 Merge commit 'b05128f3c953bd66483e697d60a2e7e45ee9cfa0'
* commit 'b05128f3c953bd66483e697d60a2e7e45ee9cfa0':
  qsv: Load the hw hevc plugin by default on Linux

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 13:58:32 -03:00
James Almer
460e7596cb Merge commit 'f19fbfbdc637e08ad5c980807ede2d023f20c049'
* commit 'f19fbfbdc637e08ad5c980807ede2d023f20c049':
  aviocat: Check for output write errors

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 13:55:35 -03:00
James Almer
4c01fa0bc5 Merge commit '585dc1aecef0371ad6f16cb3750ae2a6da9cf00a'
* commit '585dc1aecef0371ad6f16cb3750ae2a6da9cf00a':
  flvdec: Check the avio_seek return value after reading a metadata packet

This commit is a noop, see 15537c904e

Merged-by: James Almer <jamrial@gmail.com>
2017-11-11 13:48:48 -03:00