]>
git.sesse.net Git - ffmpeg/log
James Almer [Sat, 11 Nov 2017 20:25:57 +0000 (17:25 -0300)]
Merge commit '
077011b5af2b3150efc52a9b58f5ef9bb0235087 '
* commit '
077011b5af2b3150efc52a9b58f5ef9bb0235087 ':
qsv: Expose idr_interval for hevc as well
Also includes
98afe3fb71afd4a18009924aaba56bc577bbd400 .
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 20:17:30 +0000 (17:17 -0300)]
doc/libav-merge: mention more skipped outdev removal commits
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 20:15:09 +0000 (17:15 -0300)]
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
56d2154b72fba96a65b806ecf4a6f85c3f69b021
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 20:12:08 +0000 (17:12 -0300)]
doc/libav-merge: mention skipped outdev removal commit
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 20:07:37 +0000 (17:07 -0300)]
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>
James Almer [Sat, 11 Nov 2017 20:03:03 +0000 (17:03 -0300)]
Merge commit '
eb3c1a94adbc28411610167d3dac583436e50125 '
* commit '
eb3c1a94adbc28411610167d3dac583436e50125 ':
pictor: Correctly check frame dimensions
This commit is a noop, see
8c2ea3030af7b40a3c4275696fb5c76cdb80950a
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:59:36 +0000 (16:59 -0300)]
Merge commit '
a37e84be69310cd7de9540c8bc194cb0a6d158ed '
* commit '
a37e84be69310cd7de9540c8bc194cb0a6d158ed ':
makedef: Add support for identifying the ARM64 machine type
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:58:15 +0000 (16:58 -0300)]
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>
James Almer [Sat, 11 Nov 2017 19:56:59 +0000 (16:56 -0300)]
Merge commit '
0ca66409911e9fba940424be8bdfa54e056b0a4b '
* commit '
0ca66409911e9fba940424be8bdfa54e056b0a4b ':
configure: Don't add -fPIC to asflags when targeting windows
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:55:43 +0000 (16:55 -0300)]
Merge commit '
f951837ce58e8588b175fb53a76fd453a81528ec '
* commit '
f951837ce58e8588b175fb53a76fd453a81528ec ':
configure: Don't add -fPIC to cflags for target_os=win32
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:53:19 +0000 (16:53 -0300)]
Merge commit '
7ac092d05de487d088bc96ab4a7bd6207fbfa98c '
* commit '
7ac092d05de487d088bc96ab4a7bd6207fbfa98c ':
build: CryptGenRandom --> wincrypt, it is a better name
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:50:35 +0000 (16:50 -0300)]
Merge commit '
93797681c2310faeeb0158f66f471965213904c6 '
* commit '
93797681c2310faeeb0158f66f471965213904c6 ':
build: Rename stdatomic_h variable to stdatomic
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:45:00 +0000 (16:45 -0300)]
Merge commit '
62d5b5a9d3b0181335072d6fa792f2d805bc27b6 '
* commit '
62d5b5a9d3b0181335072d6fa792f2d805bc27b6 ':
configure: Extend check_header() to allow checking for multiple headers
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:42:27 +0000 (16:42 -0300)]
Merge commit '
b46900914a1f25ce8dbf49d7c53766ff1f18b60f '
* commit '
b46900914a1f25ce8dbf49d7c53766ff1f18b60f ':
build: Merge mach/mach_time.h and mach_absolute_time() checks
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:40:20 +0000 (16:40 -0300)]
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>
James Almer [Sat, 11 Nov 2017 19:33:06 +0000 (16:33 -0300)]
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>
James Almer [Sat, 11 Nov 2017 19:31:40 +0000 (16:31 -0300)]
Merge commit '
76481f57b528168b00035aee76f7e0878669011f '
* commit '
76481f57b528168b00035aee76f7e0878669011f ':
configure: Remove pointless empty *_COMPONENTS variables
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:30:11 +0000 (16:30 -0300)]
Merge commit '
1c047c8f4d5e016e89250afdeb88a4fea707cc1c '
* commit '
1c047c8f4d5e016e89250afdeb88a4fea707cc1c ':
configure: Drop stray extralibs for libspeex
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:28:42 +0000 (16:28 -0300)]
Merge commit '
3e5950287317938e6b81e7ef8f024b403c303289 '
* commit '
3e5950287317938e6b81e7ef8f024b403c303289 ':
configure: Drop unused attribute checks
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:23:48 +0000 (16:23 -0300)]
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>
James Almer [Sat, 11 Nov 2017 19:18:52 +0000 (16:18 -0300)]
Merge commit '
b586903ae1b89e2d8b99c79f33cabe9b3ca03784 '
* commit '
b586903ae1b89e2d8b99c79f33cabe9b3ca03784 ':
build: Drop redundant check for soundcard.h
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:12:16 +0000 (16:12 -0300)]
Merge commit '
8e97a8c69162afce47abea96c8c0914f3550e212 '
* commit '
8e97a8c69162afce47abea96c8c0914f3550e212 ':
build: Remove check for gsm/gsm.h for libgsm
Also includes fix from
010baac12a14d684a1ae72f6b7509e642c40f3b3
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:09:09 +0000 (16:09 -0300)]
Merge commit '
29ccc641b17afad058a5c24071ea827865a8b3a9 '
* commit '
29ccc641b17afad058a5c24071ea827865a8b3a9 ':
build: Drop check for sys/mman.h in favor of mmap() check
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:05:45 +0000 (16:05 -0300)]
Merge commit '
e7168d4c0cb279cf267690549ca92ad564572bc6 '
* commit '
e7168d4c0cb279cf267690549ca92ad564572bc6 ':
configure: Drop redundant header check for d3d11.h
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:03:21 +0000 (16:03 -0300)]
Merge commit '
4064f42889685e7122cfad4934b060098c147753 '
* commit '
4064f42889685e7122cfad4934b060098c147753 ':
build: Drop explicit check for dlfcn.h
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 19:00:30 +0000 (16:00 -0300)]
Merge commit '
fca9ca539c8c6e4fe0072486c7e0479a08a15e7c '
* commit '
fca9ca539c8c6e4fe0072486c7e0479a08a15e7c ':
configure: Drop unused or internally-used entries from variable lists
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 18:56:27 +0000 (15:56 -0300)]
Merge commit '
09c98327b9f25c6c1716c0ee82ce09d8b484887a '
* commit '
09c98327b9f25c6c1716c0ee82ce09d8b484887a ':
build: Drop support for Tru64 Unix (OSF/1)
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 18:52:38 +0000 (15:52 -0300)]
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
3b345d389be2d67017f904caa21713f53a8e8c90
7bae17e37ab63d1cfcea22c68c455f859db3663c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 18:35:32 +0000 (15:35 -0300)]
Merge commit '
d66fe7ff53a5cade7a702100a9006dfe5ae1c473 '
* commit '
d66fe7ff53a5cade7a702100a9006dfe5ae1c473 ':
configure: Add test_pkg_config()
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 18:27:47 +0000 (15:27 -0300)]
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>
James Almer [Sat, 11 Nov 2017 18:24:08 +0000 (15:24 -0300)]
Merge commit '
ea25ccd1b2a980df8d43cc1f86a23e3c094090a6 '
* commit '
ea25ccd1b2a980df8d43cc1f86a23e3c094090a6 ':
qsv: Join the derived session to the parent
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 18:23:49 +0000 (15:23 -0300)]
Merge commit '
ccbb31c14b766ef666ef2daa8c467e478183a957 '
* commit '
ccbb31c14b766ef666ef2daa8c467e478183a957 ':
qsv: Make sure the session is set with the latest version
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 18:21:22 +0000 (15:21 -0300)]
James Almer [Sat, 11 Nov 2017 18:17:42 +0000 (15:17 -0300)]
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
6f15f1cdc85350b7adcfb7c50eedb5ecde6a384a
547b8aeed442dbb3b2cf4a2c507c63e869795cfd
7ed47e97297fd5ef473d0cc93f0455adbadaac83
624d4739dbfc950ee756e83ae187f97dc82d10c9
6743351558001764d662bb52b9a3e0bbb63366d6
809b0402dc916b876dfdd6bb9c88f171cf3e77c0
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 17:46:24 +0000 (14:46 -0300)]
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>
James Almer [Sat, 11 Nov 2017 17:15:45 +0000 (14:15 -0300)]
Merge commit '
ac6691ab9938107d818cd8066ce3ea329ad14d8d '
* commit '
ac6691ab9938107d818cd8066ce3ea329ad14d8d ':
avio: update avio_alloc_context() doxy
This commit is a noop, see
877076ffa17bcf56badedc036cdc1adcd9f38b24
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 17:08:24 +0000 (14:08 -0300)]
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
94a4048619665e99a19d9e2961254dc9b5c736a7
9b0c7aa0e446eceec96ba8f4009e004fad29fba3
686e388bbb6aeef077095a83f84b53d143d44d63
278c308ceae6b8d7bac1dfc24518821aae603988
d8928ad6b6e899c409129c8e16b225c09a8a5abb
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 17:07:09 +0000 (14:07 -0300)]
Merge commit '
f940c859c23ae201b0170cf541ea8f6b7a52dd49 '
* commit '
f940c859c23ae201b0170cf541ea8f6b7a52dd49 ':
Revert "vaapi_h265: Reduce the amount of padding in the stream"
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 17:05:59 +0000 (14:05 -0300)]
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
6734eef6b8b464139fdc140ec9bc9e8d74173869
b4c915f4b3e15c3e787e319b961e4389762f6309
a308872b049e33f69f4b629a06f47e3681906b93
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 16:58:32 +0000 (13:58 -0300)]
Merge commit '
b05128f3c953bd66483e697d60a2e7e45ee9cfa0 '
* commit '
b05128f3c953bd66483e697d60a2e7e45ee9cfa0 ':
qsv: Load the hw hevc plugin by default on Linux
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 16:55:35 +0000 (13:55 -0300)]
Merge commit '
f19fbfbdc637e08ad5c980807ede2d023f20c049 '
* commit '
f19fbfbdc637e08ad5c980807ede2d023f20c049 ':
aviocat: Check for output write errors
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 16:48:48 +0000 (13:48 -0300)]
Merge commit '
585dc1aecef0371ad6f16cb3750ae2a6da9cf00a '
* commit '
585dc1aecef0371ad6f16cb3750ae2a6da9cf00a ':
flvdec: Check the avio_seek return value after reading a metadata packet
This commit is a noop, see
15537c904ec96e4d2e9435100d403283a5fed029
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 16:46:06 +0000 (13:46 -0300)]
Merge commit '
e12f1cd616573795681ce939113ac6cdad4c1f2b '
* commit '
e12f1cd616573795681ce939113ac6cdad4c1f2b ':
Revert "checkasm: Test more h264 idct variants"
This commit is a noop. The code is readded with minimal cosmetic
changes in a latter commit, so don't even bother removing it here.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 16:44:07 +0000 (13:44 -0300)]
Merge commit '
9dde6ab06c48f9447cd16f39bee33569cddb7be4 '
* commit '
9dde6ab06c48f9447cd16f39bee33569cddb7be4 ':
arm: Fix SIGBUS on ARM when compiled with binutils 2.29
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 16:18:55 +0000 (13:18 -0300)]
Merge commit '
547db1eaecd597031165a2bf637acaaacde52788 '
* commit '
547db1eaecd597031165a2bf637acaaacde52788 ':
checkasm: Test more h264 idct variants
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 16:16:24 +0000 (13:16 -0300)]
Merge commit '
39e16ee2289e4240a82597b97db5541bbbd2b996 '
* commit '
39e16ee2289e4240a82597b97db5541bbbd2b996 ':
Revert "fate: Skip the checkasm test if CONFIG_STATIC is disabled"
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 14:40:06 +0000 (11:40 -0300)]
Merge commit '
accb06120c13a4ead442464d96f2fa318fa07a4e '
* commit '
accb06120c13a4ead442464d96f2fa318fa07a4e ':
configure: Use dllexport/dllimport for data symbols across DLLs with mingw
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 14:31:22 +0000 (11:31 -0300)]
Merge commit '
1a7bf48eed806beea7e835b31b06aa6bc94da5da '
* commit '
1a7bf48eed806beea7e835b31b06aa6bc94da5da ':
makedef: Extend the script for use with mingw tools as well
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 14:30:32 +0000 (11:30 -0300)]
Merge commit '
44aa9105c535471ca9e23796d7ca29b341f47636 '
* commit '
44aa9105c535471ca9e23796d7ca29b341f47636 ':
makedef: Fold as much text transformations as possible into the initial dump
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 13:32:09 +0000 (10:32 -0300)]
Merge commit '
abf1c058d1bd0ed1b820ea5e501a4484756f00b0 '
* commit '
abf1c058d1bd0ed1b820ea5e501a4484756f00b0 ':
msvc: Properly specify dllexport for data symbols shared across dll boundaries
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 13:22:11 +0000 (10:22 -0300)]
Merge commit '
e41daa62465036ad36ad0bd14e4936e848d7f07e '
* commit '
e41daa62465036ad36ad0bd14e4936e848d7f07e ':
Remove support for building for mingw32ce (Windows CE)
Merged-by: James Almer <jamrial@gmail.com>
Timo Rothenpieler [Sat, 11 Nov 2017 12:12:06 +0000 (13:12 +0100)]
wmavoice: free frame before ff_get_buffer
synth_superframe can be called twice per call to decode_packet.
It is not fully clear if calling ff_get_buffer on the same frame twice
is supported, so unref the frame first to be save.
Timo Rothenpieler [Sat, 11 Nov 2017 11:59:44 +0000 (12:59 +0100)]
avcodec/decode: always free private_ref
There is no reason to keep this intact when decoding failed, specially
as private_ref is supposed to always be NULL when a frame is returned to
the user.
Timo Rothenpieler [Fri, 10 Nov 2017 21:06:22 +0000 (22:06 +0100)]
ffmpeg: use explicitly requested hwaccel only
With there being two hwaccels that use the CUDA pix_fmt now, just
relying on the pix_fmt to identify the selected hwaccel is not enough
anymore.
So this checks if the user explicitly selected a hwaccel, and only
accepts that one.
Sasi Inguva [Fri, 10 Nov 2017 00:11:22 +0000 (16:11 -0800)]
lavf/mov.c: Parse upto 2 keyframes after the edit list end in mov_fix_index.
Partially fixes t/6699.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Aleksandr Slobodeniuk [Fri, 10 Nov 2017 10:51:07 +0000 (13:51 +0300)]
avcodec: fix wrong duration of packets (dvd, bluray)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 31 Oct 2017 19:44:21 +0000 (20:44 +0100)]
avformat/utils: Look at the first 3 frames if timestamps indicate frame reorder but decoder delay does not
Fixes: Ticket6487
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
John Stebbins [Sat, 11 Nov 2017 00:07:28 +0000 (16:07 -0800)]
avformat/utils: preserve AV_PKT_FLAG_DISCARD in parse_packet
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Sat, 11 Nov 2017 13:14:11 +0000 (10:14 -0300)]
Merge commit '
173b56218f39c6463be0e182259e2deead106936 '
* commit '
173b56218f39c6463be0e182259e2deead106936 ':
lavf: make avio_read_partial() public
swscale: Do not expand a macro with 'defined' in it
configure: Include d3d11va_extralibs in libavutil
This commit is a noop, see
69218b41980883a7e75656f3058171939f5729ef
add7b3bc3fb7685cd0a3ccffd2b09cc0e32c39ec
5d76674756806e3b458e484788775fcee34aac2a
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 13:09:41 +0000 (10:09 -0300)]
Merge commit '
feed239021bad89743d5e7989b426ae594322eb7 '
* commit '
feed239021bad89743d5e7989b426ae594322eb7 ':
yadif: Account for the buffer alignment while processing the frame edges
See
221f902f1dc167bdc0bfdff6b6af3214ae3cc1f4
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 13:02:43 +0000 (10:02 -0300)]
Merge commit '
7b7760ad6efb7b96122aa7133ad21e22653ae222 '
* commit '
7b7760ad6efb7b96122aa7133ad21e22653ae222 ':
aarch64: Fix negative movrel offsets for windows
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 13:01:43 +0000 (10:01 -0300)]
Merge commit '
0c99b900d874b60ce89b94742b2215f163c87a2b '
* commit '
0c99b900d874b60ce89b94742b2215f163c87a2b ':
png: Support RGBA64 pixel format
This commit is a noop, see
97da38c99bf5ad619ea15f2f1b4c050f0f44d11f
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 12:58:01 +0000 (09:58 -0300)]
Merge commit '
9f5b77c16f4da6248b57f0601364d9c762c620c2 '
* commit '
9f5b77c16f4da6248b57f0601364d9c762c620c2 ':
png: Report more details regarding unsupported pixel formats
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 04:41:16 +0000 (01:41 -0300)]
avcodec/dnxhddata: remove dead code
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 04:39:47 +0000 (01:39 -0300)]
avcodec/mpegaudiodecheader: remove dead code
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 04:24:55 +0000 (01:24 -0300)]
Merge commit '
4c0588b4562abad5540f6a5435c62828de9e4fdf '
* commit '
4c0588b4562abad5540f6a5435c62828de9e4fdf ':
mpeg2enc: Don't mark all streams as component video
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 04:05:13 +0000 (01:05 -0300)]
Merge commit '
b78c30d7ec26af67c00ce2002709a189f6a87a7e '
* commit '
b78c30d7ec26af67c00ce2002709a189f6a87a7e ':
lavc: Add mpeg2_metadata bitstream filter
lavc: Add coded bitstream read/write support for MPEG-2
cbs_h2645: Return error if writing fails
h264dec: use a large enough field for reference list modification values
xwddec: support 8bpp grayscale
This commit is a noop, see
b9c94e826e7551027754ecfa60e3e487e0c28fcb
2aff557c6acbce2b2b604c6c620c66c892260062
b4c915f4b3e15c3e787e319b961e4389762f6309
686e388bbb6aeef077095a83f84b53d143d44d63
569721ac8dee6b73cd68ea858f59c7d800a1686d
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 03:54:19 +0000 (00:54 -0300)]
Merge commit '
d34a133b78afe2793cd8537f3c7f42437f441e94 '
* commit '
d34a133b78afe2793cd8537f3c7f42437f441e94 ':
dfa: Disallow odd width/height and add proper bounds check for DDS1 chunks
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 03:49:43 +0000 (00:49 -0300)]
Merge commit '
a14a12ca137bf1526452b97bedfc9f7b301d4e04 '
* commit '
a14a12ca137bf1526452b97bedfc9f7b301d4e04 ':
vaapi_h265: Reduce the amount of padding in the stream
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 03:47:22 +0000 (00:47 -0300)]
Merge commit '
e3e8eab359238486dc233f7aa89b7bb3cb19ec38 '
* commit '
e3e8eab359238486dc233f7aa89b7bb3cb19ec38 ':
vaapi_h265: Add support for AUD NAL units
vaapi_h265: Convert to use coded bitstream infrastructure
vaapi_h264: Add support for SEI recovery points
vaapi_h264: Add support for AUD NAL units
vaapi_h264: Convert to use coded bitstream infrastructure
lavc: Add hevc_metadata bitstream filter
lavc: Add h264_redundant_pps bitstream filter
lavc: Add h264_metadata bitstream filter
lavc: Add trace_headers bitstream filter
lavc: Add coded bitstream read/write support for H.265
lavc: Add coded bitstream read/write support for H.264
lavc: Add coded bitstream read/write API
pixfmt: Support chroma-derived and ictcp color matrices
h264: Add support for alternative transfer characterics SEI
vaapi_encode: Move quality option to common code
This commit is a noop, see
9c878651dbc8c795894740af74670b591551f619
8c34a2024da77b50470e62789e4859b45959932e
f3571048669bf876681499f49e9df492f05f73c6
6734eef6b8b464139fdc140ec9bc9e8d74173869
b4c915f4b3e15c3e787e319b961e4389762f6309
9b0c7aa0e446eceec96ba8f4009e004fad29fba3
9c7d70b49b64aa5571772a7cdb9bc426174261e0
a308872b049e33f69f4b629a06f47e3681906b93
8b26306294ffe78cc73357e2ddd56dd463db50ab
03f982bbca4211108477e772db9a339517ecde37
2e29ca2a9f19ba9a5b189f322f38497d2e2e3db0
281b68b0265953ab2623a39484d927a0e921c405
0bc7575ced65bf4aa4678ac12d550aaf87890d0e
00179664bccd1dd6fa0d1c40db453528757bf6f7
038a51258c4c5d8b77f4f9efcce6f397e5755c24
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 03:36:22 +0000 (00:36 -0300)]
Merge commit '
1329c08ad6d2ddb304858f2972c67b508e8b0f0e '
* commit '
1329c08ad6d2ddb304858f2972c67b508e8b0f0e ':
hevc: Validate the number of long term reference pictures
See
ea38e5a6b75706477898eb1e6582d667dbb9946c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 03:34:18 +0000 (00:34 -0300)]
Merge commit '
b88da98b34809dedf8882d43ed543632ed233538 '
* commit '
b88da98b34809dedf8882d43ed543632ed233538 ':
hevc: Improve stream constraint values in common header
h264: Add stream constraint values to the common header
This commit is a noop, see
d05444d2c6d99767547b1f0761e8459fb07b305d
b1374e925c1cf3af5c8482119f3f2630d66213de
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 03:28:53 +0000 (00:28 -0300)]
Merge commit '
defe307fb22beca60a632e976ab97e5edd4aee25 '
* commit '
defe307fb22beca60a632e976ab97e5edd4aee25 ':
mov: move stsd finalization to an appropriate place
mov: Do not set stsd_count if mov_read_stsd() fails
mov: log and return early on non-positive stsd entry counts
See
8b43ee4054af799e388d380b379a13a60849c1b5
656feb641de3cd5b9cb4e33ffd3f0ad4664c36d2
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 11 Nov 2017 00:06:58 +0000 (21:06 -0300)]
avcodec/nvdec: fix copyright headers
Fixes fate-source.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 10 Nov 2017 23:38:36 +0000 (20:38 -0300)]
Merge commit '
b90fdb2c7199cc8b0e8d994fafba1fb4dc181d88 '
* commit '
b90fdb2c7199cc8b0e8d994fafba1fb4dc181d88 ':
hevcdec: add a CUVID hwaccel
Adapted for ffmpeg by Timo Rothenpieler.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 10 Nov 2017 23:36:39 +0000 (20:36 -0300)]
Merge commit '
770cf1dbc2c8fe9b84300439ad0cd85036480388 '
* commit '
770cf1dbc2c8fe9b84300439ad0cd85036480388 ':
fate/hevc: specify output pixel format explicitly
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 10 Nov 2017 23:31:55 +0000 (20:31 -0300)]
Merge commit '
00fd914d4912322212e924c15f325cebf2fde8d3 '
* commit '
00fd914d4912322212e924c15f325cebf2fde8d3 ':
hevcdec: set the active SPS before calling get_format()
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 10 Nov 2017 23:23:43 +0000 (20:23 -0300)]
Merge commit '
a58873b11198d04670b7f98f5a8a749d742db7c5 '
* commit '
a58873b11198d04670b7f98f5a8a749d742db7c5 ':
avconv: when using -loop option bail out if seek to start fails
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 10 Nov 2017 23:16:15 +0000 (20:16 -0300)]
Merge commit '
004ea63714e31ed43326ad00d7420d104f0dab38 '
* commit '
004ea63714e31ed43326ad00d7420d104f0dab38 ':
cuvid: add cuvid.h to SKIPHEADERS
This commit is a noop, nvdec.h compiles just fine since it doesn't
depend on external headers.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 10 Nov 2017 22:43:46 +0000 (19:43 -0300)]
Merge commit '
b9129ec4668c511e0a79e25c6f25d748cee172c9 '
* commit '
b9129ec4668c511e0a79e25c6f25d748cee172c9 ':
h264dec: add a CUVID hwaccel
decode: add a per-frame private data for hwaccel use
decode: add a mechanism for performing delayed processing on the decoded frames
decode: add a method for attaching lavc-internal data to frames
decode: avoid leaks on failure in ff_get_buffer()
This commit is a noop, see
4776c61424fa32394e251e9769e1ad2c2fa55598
9f1cfd88af88a7d7d5c56a368a46639dfdfdef75
7fa64514c8d2ec4d3dcb5f194511609ddcc288e6
81c021c6a2d7848c31984d65f225ba54bdd6f560
0e00624389955bc559d75855d5c4876266d9575f
Merged-by: James Almer <jamrial@gmail.com>
Anton Khirnov [Sat, 11 Feb 2017 15:49:34 +0000 (16:49 +0100)]
h264dec: add a NVDEC hwaccel
Some parts of the code are based on a patch by
Timo Rothenpieler <timo@rothenpieler.org>
Merges Libav commit
b9129ec4668c511e0a79e25c6f25d748cee172c9 .
Due to the name clash with our cuvid decoder, rename it to nvdec.
This commit also changes the Libav code to dynamic loading of the
cuda/cuvid libraries.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
wm4 [Tue, 3 Oct 2017 15:43:13 +0000 (17:43 +0200)]
avcodec/decode: add missing \n to log message
wm4 [Tue, 3 Oct 2017 13:04:45 +0000 (15:04 +0200)]
avcodec: allow multiple hwaccels for the same codec/pixfmt
Currently, AVHWAccels are looked up using a (codec_id, pixfmt) tuple.
This means it's impossible to have 2 decoders for the same codec and
using the same opaque hardware pixel format.
This breaks merging Libav's CUVID hwaccel. FFmpeg has its own CUVID
support, but it's a full stream decoder, using NVIDIA's codec parser.
The Libav one is a true hwaccel, which is based on the builtin software
decoders.
Fix this by introducing another field to disambiguate AVHWAccels, and
use it for our CUVID decoders. FF_CODEC_CAP_HWACCEL_REQUIRE_CLASS makes
this mechanism backwards compatible and optional.
wm4 [Tue, 3 Oct 2017 13:15:16 +0000 (15:15 +0200)]
avcodec/cuvid: rename cuvid.c to cuviddec.c
cuvid.c is used by Libav's CUVID hwaccel. Resolve the conflict and
avoid future merge problems by renaming our decoder.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Rostislav Pehlivanov [Fri, 10 Nov 2017 21:31:07 +0000 (21:31 +0000)]
Changelog: list the new aptX features
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Aurelien Jacobs [Fri, 10 Nov 2017 21:09:24 +0000 (22:09 +0100)]
aptx: add raw muxer and demuxer for aptX
Aurelien Jacobs [Fri, 10 Nov 2017 21:09:23 +0000 (22:09 +0100)]
aptx: implement the aptX bluetooth codec
The encoder was reverse engineered from binary library and from
EP0398973B1 patent (long expired).
The decoder was simply deduced from the encoder.
Anton Khirnov [Fri, 13 Oct 2017 16:59:19 +0000 (18:59 +0200)]
decode: add a per-frame private data for hwaccel use
This will be useful in the CUVID hwaccel. It should also eventually
replace current decoder-specific mechanisms used by various other
hwaccels.
Merges Libav commit
704311b2946d74a80f65906961cd9baaa18683a3 .
Anton Khirnov [Fri, 10 Nov 2017 15:07:44 +0000 (16:07 +0100)]
decode: add a mechanism for performing delayed processing on the decoded frames
This will be useful in the CUVID hwaccel.
Merges Libav commit
badf0951f54c1332e77455dc40398f3512540c1b .
Anton Khirnov [Fri, 13 Oct 2017 16:59:17 +0000 (18:59 +0200)]
decode: add a method for attaching lavc-internal data to frames
Use the AVFrame.private_ref field.
This new struct will be useful in the following commits.
Merges Libav commit
359a8a3e2d1194b52b6c386f94fd0929567dfb67 .
Michael Niedermayer [Wed, 8 Nov 2017 22:55:00 +0000 (23:55 +0100)]
avutil/frame: Add private_ref to AVFrame
This gives FFmpeg libs a field that they can freely and safely use.
Avoiding the need of wrapping of a users opaque_ref field and its issues.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jun Zhao [Wed, 8 Nov 2017 13:04:51 +0000 (21:04 +0800)]
lavc/libx265: switch to ff_alloc_packet2
ff_alloc_packet have been deprecated, switch to use
ff_alloc_packet2.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jun Zhao [Wed, 8 Nov 2017 13:02:23 +0000 (21:02 +0800)]
lavc/libkvazaar: switch to ff_alloc_packet2.
ff_alloc_packet have been deprecated, switch to use the
ff_alloc_packet2.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Gyan Doshi [Sun, 5 Nov 2017 15:59:22 +0000 (21:29 +0530)]
lavu/timecode: clarify error msg for timecode_rate
The user-supplied value for timecode_rate in drawtext is rounded
to nearest integer. So, a supplied value of 0.49 or lower is rounded to 0.
This throws a misleading error message which says "Timecode frame rate must be
specified". Changed message to account for values under one.
Also noted supported framerates for drop TC.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Steven Liu [Thu, 9 Nov 2017 23:01:45 +0000 (07:01 +0800)]
avformat/dashdec: use the current DASHContext for the rep_dest
fix ticket id: #6820
Signed-off-by: Steven Liu <lq@onvideo.cn>
Tested-by: mrskman
Carl Eugen Hoyos [Thu, 9 Nov 2017 22:59:25 +0000 (06:59 +0800)]
lavf/dashdec: Fix several memleaks.
Signed-off-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Tested-by: Steven Liu <lq@chinaffmpeg.org>
Michael Niedermayer [Thu, 2 Nov 2017 17:34:09 +0000 (18:34 +0100)]
avcodec/cngdec: Fix integer clipping
Fixes: runtime error: value -36211.7 is outside the range of representable values of type 'short'
Fixes: 2992/clusterfuzz-testcase-6649611793989632
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Thu, 9 Nov 2017 17:27:33 +0000 (14:27 -0300)]
configure: fix the non pkg-config libmfx check on Windows
Based on a patch by Aaron Levinson.
Reviewed-by: alevinsn
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 9 Nov 2017 03:18:32 +0000 (00:18 -0300)]
avdevice/decklink_dec: make some function static
Reviewed-by: Aaron Levinson <alevinsn_dev@levland.net>
Signed-off-by: James Almer <jamrial@gmail.com>
Nicolas George [Thu, 9 Nov 2017 08:21:05 +0000 (09:21 +0100)]
lavc/pngdec: fix av_bprint_finalize() usage.