]>
git.sesse.net Git - ffmpeg/log
Michael Niedermayer [Sat, 4 Nov 2017 00:19:19 +0000 (01:19 +0100)]
avcodec/exr: fix undefined shift in pxr24_uncompress()
Fixes: runtime error: left shift of 255 by 24 places cannot be represented in type 'int'
Fixes: 3787/clusterfuzz-testcase-minimized-5728764920070144
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kieran Kunhya [Sat, 4 Nov 2017 18:31:59 +0000 (18:31 +0000)]
Revert "vc2enc: Calculate average slice quantiser correctly"
This reverts commit
626d200e76e15487cff20992256a55919432b0b3 .
Marton Balint [Sat, 28 Oct 2017 20:46:08 +0000 (22:46 +0200)]
ffplay: only use hardware accelerated SDL texture formats
Typically only a small subset of the SDL texture formats are supported directly
by the SDL renderer drivers, the rest is software emulated. It's better if
libswscale does the format conversion to a hardware-accelerated texture format
instead of SDL.
This should fix video render slowdowns with some texture formats after
3bd2228d05a05eab5f91ac00b01efac9cb07649b .
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 28 Oct 2017 20:06:22 +0000 (22:06 +0200)]
ffplay: create the window and the renderer before starting playback
Signed-off-by: Marton Balint <cus@passwd.hu>
Kieran Kunhya [Mon, 24 Jul 2017 18:25:41 +0000 (19:25 +0100)]
vc2enc: Calculate average slice quantiser correctly
Kieran Kunhya [Wed, 30 Aug 2017 13:38:46 +0000 (14:38 +0100)]
h264: Make Truncating SPS/PPS message debug.
Kieran Kunhya [Sat, 4 Nov 2017 17:41:06 +0000 (17:41 +0000)]
h2645_parse: Allocate a single buffer per packet
Drastically reduces memory usage on pathological streams.
Fixes ticket #6789
Carl Eugen Hoyos [Wed, 1 Nov 2017 14:14:22 +0000 (15:14 +0100)]
lavc/alac: Avoid allocating huge memory blocks for malicious alac input.
Kaustubh Raste [Fri, 3 Nov 2017 06:29:08 +0000 (11:59 +0530)]
avcodec/mips: Improve hevc bi wgt 4 tap hz and vt mc msa functions
Use global mask buffer for appropriate mask load.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Fri, 3 Nov 2017 05:37:08 +0000 (11:07 +0530)]
avcodec/mips: Improve hevc bi 4 tap hz and vt mc msa functions
Use global mask buffer for appropriate mask load.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Fri, 3 Nov 2017 05:09:18 +0000 (10:39 +0530)]
avcodec/mips: Improve avc avg mc 20, 21 and 23 msa functions
Load the specific destination bytes instead of MSA load and pack.
Remove unused macros and functions.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Sasi Inguva [Fri, 3 Nov 2017 00:33:28 +0000 (17:33 -0700)]
lavf/mov.c: Refine edit list start seek, based on PTS computed from CTTS.
Partially fixes t/6699.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Wed, 1 Nov 2017 20:39:33 +0000 (21:39 +0100)]
fate: Fix fitsdec-gbrap16 test on big-endian hardware.
Paul B Mahol [Tue, 10 Oct 2017 19:18:03 +0000 (21:18 +0200)]
avfilter/vf_tile: remove limit of max tile size
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas Frattaroli [Thu, 2 Nov 2017 19:12:48 +0000 (20:12 +0100)]
snowenc: fix use of deprecated API
Replace avcodec_get_chroma_sub_sample with the recommended
av_pix_fmt_get_chroma_sub_sample, which fixes a compilation warning.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Nicolas Frattaroli [Thu, 2 Nov 2017 22:39:53 +0000 (23:39 +0100)]
diracdec: fix deprecated API usage
avcodec_get_chroma_sub_sample is deprecated and generates a warning
during build, so av_pix_fmt_get_chroma_sub_sample is used
Signed-off-by: Nicolas Frattaroli <ffmpeg@fratti.ch>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 3 Nov 2017 02:39:28 +0000 (23:39 -0300)]
Merge commit '
eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888 '
* commit '
eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888 ':
tls_gnutls: Readd support for nonblocking operation
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 3 Nov 2017 02:27:53 +0000 (23:27 -0300)]
Merge commit '
0671eb2346c17e8fb13784cf90ce416661fdea1c '
* commit '
0671eb2346c17e8fb13784cf90ce416661fdea1c ':
tls_openssl: Readd support for nonblocking operation
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 3 Nov 2017 02:26:46 +0000 (23:26 -0300)]
avformat/tls_openssl: move some functions up in the file
Cosmetic change, reduces differences with libav.
James Almer [Fri, 3 Nov 2017 00:57:01 +0000 (21:57 -0300)]
Merge commit '
84ab1cc437fa47a00532f305b9fe15b5b66c8c5e '
* commit '
84ab1cc437fa47a00532f305b9fe15b5b66c8c5e ':
movenc: allow alternative hvc1 h.265 codec tag
movenc: write correct format hvcc when tag is hvc1
movenc: move tags definitions to where they are used
movenc: simplify codec_tag lookup
movenc: use correct tag list for AVOutputFormat.codec_tag
aarch64: vp9: Fix assembling with Xcode 6.2 and older
doc: Drop the legacy symlink to README
This commit is a noop, see
998609ddb8884fd0f33abdb74c8bd4e1234032b1
95f3c85976ff79af6fd10ce3f7a90fcb054c3fc0
e199d90da6473abc0d010797b14f2ae2c9811d34
38d808d72e393f9a769ef1543a7eff15fadc1980
974d508e571085dce43e688595da058804169088
369a3e111cb8015c3a3acc5c2c15728c8f37084f
Merged-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Wed, 1 Nov 2017 19:02:59 +0000 (20:02 +0100)]
avcodec/gdv: Check compression before allocating frame
Fixes: 2926/clusterfuzz-testcase-4987110014582784
This reduces decoding time from 7 to 4 seconds
The timeout should have been fixed in
0561bd2fc2bff0dbe651d5998e9f129c43d25eb3 but ossfuzz did not close this issue
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Tue, 31 Oct 2017 13:00:40 +0000 (18:30 +0530)]
avcodec/mips: Improve hevc uni weighted hv mc msa functions
Use immediate unsigned saturation for clip to max saving one vector register.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Wed, 1 Nov 2017 06:06:25 +0000 (11:36 +0530)]
avcodec/mips: Improve avc avg mc 02, 12 and 32 msa functions
Remove loops and unroll as block sizes are known.
Load the specific destination bytes instead of MSA load and pack.
Remove unused macro and functions.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Steven Liu [Thu, 2 Nov 2017 14:30:06 +0000 (22:30 +0800)]
avformat/hlsenc: reindent hlsenc code
Signed-off-by: Steven Liu <lq@onvideo.cn>
Steven Liu [Thu, 2 Nov 2017 14:29:28 +0000 (22:29 +0800)]
avformat/hlsenc: check hls segment mode for ignore the init filename
ignore the fmp4_init_filename when in normal hls segment mode
Signed-off-by: Steven Liu <lq@onvideo.cn>
Nicolas George [Wed, 1 Nov 2017 20:38:39 +0000 (21:38 +0100)]
lavfi/framepool: use av_image_check_size2().
Allow filters to handle larger frames.
Nicolas George [Wed, 1 Nov 2017 20:15:00 +0000 (21:15 +0100)]
lavfi: check links properties after configuring them.
For now, check the image size.
Inspired by a patch from Paul B Mahol.
Invalid sizes would be detected later by allocation failures,
detecting problems earlier is cleaner.
James Almer [Thu, 2 Nov 2017 00:02:02 +0000 (21:02 -0300)]
Merge commit '
fd1ffa1f10e940165035ccb79d4a6523da196062 '
* commit '
fd1ffa1f10e940165035ccb79d4a6523da196062 ':
d3d11va: Link directly to dxgi.dll and d3d11.dll functions if LoadLibrary is unavailable
This commit is a noop, see
3125a4a8a8fc7dde938bff6a668f53b26bf47860
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:58:26 +0000 (20:58 -0300)]
Merge commit '
c2b0bea40f1fd4399ff6184a2df4f397c0f4b3ab '
* commit '
c2b0bea40f1fd4399ff6184a2df4f397c0f4b3ab ':
avconv_hw: Free device on initialisation failure
vf_hwmap: Properly free a locally derived device
vf_hwmap: Add missing error code
configure: Fix handling of _select dependencies
This commit is a noop, see
6dfcbd80ad446ff163b47f2bf432bbf706436ea8
d984b29b21f6442fb6a809c08c07533dd496b1f9
70808859ddf4c636472b56f5ec637c4754276867
f434ddf48e084a7a5631e7a9dd1d9771d97e114c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:56:07 +0000 (20:56 -0300)]
Merge commit '
7b1f9873be2f9d5aea2762c9197ff46df82768dc '
* commit '
7b1f9873be2f9d5aea2762c9197ff46df82768dc ':
build: Adjust dependencies for faan(i)dct components
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:51:03 +0000 (20:51 -0300)]
Merge commit '
635897ac78ef29869f0321ab921c91b3e1aad453 '
* commit '
635897ac78ef29869f0321ab921c91b3e1aad453 ':
configure: Factorize qsv dependencies
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:39:37 +0000 (20:39 -0300)]
Merge commit '
c599c43fa147d7a001cdbf8f3b7da0a965f2e285 '
* commit '
c599c43fa147d7a001cdbf8f3b7da0a965f2e285 ':
configure: Add missing arch dependencies for arch extensions
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:33:47 +0000 (20:33 -0300)]
Merge commit '
9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6 '
* commit '
9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6 ':
configure: Add x86 dependency for mmx_internal
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:33:02 +0000 (20:33 -0300)]
Merge commit '
2f792cb6703b5b12f2e873bee13f33da8aa9940a '
* commit '
2f792cb6703b5b12f2e873bee13f33da8aa9940a ':
build: Add missing idctdsp dependency for clearvideo
build: Add missing mpeg4audio dependency for RTP muxer
This commit is a noop, see
52f954da7594c31ad94c9bcb54290145b59b27f5
155f071bad5a06364f42a4533b352a85a1451d97
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:24:14 +0000 (20:24 -0300)]
Merge commit '
4993a68f0f9285f92a42a54305dc0244665b7db4 '
* commit '
4993a68f0f9285f92a42a54305dc0244665b7db4 ':
hwcontext: Mark local table static const
libfdk-aacdec: Correct buffer_size parameter
This commit is a noop, see
ca6776a993903dbcfef5ae8a18556c40ecf83e1c
0b1794a43e1083644aa3db2a09323681cfe080ec
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:21:35 +0000 (20:21 -0300)]
Merge commit '
04f691cd4fb7d226e54df886a21ba201cb5019f4 '
* commit '
04f691cd4fb7d226e54df886a21ba201cb5019f4 ':
mmal: Add missing .item_name to AVClass declaration
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:18:54 +0000 (20:18 -0300)]
Merge commit '
e2edf1529cb35eaf043e3f8e5cba498ed06e2563 '
* commit '
e2edf1529cb35eaf043e3f8e5cba498ed06e2563 ':
configure: Simplify AltiVec/VSX check with a helper function
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:15:43 +0000 (20:15 -0300)]
Merge commit '
d76479c5020ca43e67d47ba3767146b192dc4782 '
* commit '
d76479c5020ca43e67d47ba3767146b192dc4782 ':
ppc: Drop support for Apple GCC
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 23:05:09 +0000 (20:05 -0300)]
Merge commit '
97cfe1d8bd1968143e2ba9aa46ebe9504a835e24 '
* commit '
97cfe1d8bd1968143e2ba9aa46ebe9504a835e24 ':
Convert all AVClass struct declarations to designated initializers.
Merged-by: James Almer <jamrial@gmail.com>
Gyan Doshi [Sun, 29 Oct 2017 07:53:18 +0000 (13:23 +0530)]
lavf/img2enc: remove redundant option 'updatefirst'
'updatefirst' is an undocumented option redundant to older option 'update'. Since it doesn't serve as a shorthand, this patch removes it.
James Almer [Wed, 1 Nov 2017 21:51:40 +0000 (18:51 -0300)]
Merge commit '
98ea98069b40c34aa7b762096f8f380012a7dd84 '
* commit '
98ea98069b40c34aa7b762096f8f380012a7dd84 ':
nvenc: Add default value for AVCodecContext::refs
This commit is a noop, see
d8da329cc364b36dabbb3162f788f958d8b6ea46
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 21:46:44 +0000 (18:46 -0300)]
Merge commit '
f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f '
* commit '
f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f ':
dxva: add support for new dxva2 and d3d11 hwaccel APIs
dxva: move d3d11 locking/unlocking to functions
dxva: preparations for new hwaccel API
lavc: set avctx->hwaccel before init
lavu: add new D3D11 pixfmt and hwcontext
This commit is a noop, see
3303511f33dcc1b708fc18072cd93bca62196676
865360ba633b09f1292d52ba6d07f16b6bcef6df
ab28108a361196134704071b7b34c42fc7d747c7
5659f7404731415c7e1cfdf4d8b0afeb6b1132de
70143a3954e1c4412efb2bf1a3a818adea2d3abf
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 21:45:23 +0000 (18:45 -0300)]
Merge commit '
ed434be106a4615e0419b3ac7664220741afda2d '
* commit '
ed434be106a4615e0419b3ac7664220741afda2d ':
configure: Bail out if both GnuTLS and OpenSSL are enabled
configure: Move x86 assembler sanity check into assembler probe function
build: Add missing zlib dependencies for several protocols
This commit is a noop, see
6dfcbd80ad446ff163b47f2bf432bbf706436ea8
5cae5a1defa360da076365a786093a749d1ddf4e
4600b0619afc58b58de1a21d7a2c472e0d788282
Merged-by: James Almer <jamrial@gmail.com>
Carl Eugen Hoyos [Wed, 1 Nov 2017 21:41:09 +0000 (22:41 +0100)]
lavc/ppc/hpeldsp_altivec: Remove declaration of two unused variables.
James Almer [Tue, 31 Oct 2017 03:36:32 +0000 (00:36 -0300)]
avcodec/dca: return standard error codes in avpriv_dca_parse_core_frame_header()
This prevents making the DCAParseError enum part of the ABI.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: foo86 <foobaz86@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Mon, 30 Oct 2017 22:21:41 +0000 (23:21 +0100)]
avcodec/h264idct_template: Fix integer overflows in ff_h264_idct8_add()
Fixes: runtime error: signed integer overflow: 924846844 + 1457520640 cannot be represented in type 'int'
Fixes: 3416/clusterfuzz-testcase-minimized-6125587682820096
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 30 Oct 2017 22:21:40 +0000 (23:21 +0100)]
avcodec/xan: Improve overlapping check
Fixes: memcpy-param-overlap
Fixes: 3612/clusterfuzz-testcase-minimized-6393461273001984
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 [Wed, 1 Nov 2017 21:01:32 +0000 (18:01 -0300)]
Merge commit '
908f737d6c2900b5d34319ca6ea1d1cb71221463 '
* commit '
908f737d6c2900b5d34319ca6ea1d1cb71221463 ':
cmdutils: Mark conditionally used variable as av_unused
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 20:38:30 +0000 (17:38 -0300)]
Merge commit '
f960fd2fb1218d49866d0bf47cbf839233fb9904 '
* commit '
f960fd2fb1218d49866d0bf47cbf839233fb9904 ':
build: Skip generating .version files when reconfiguring
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 20:37:48 +0000 (17:37 -0300)]
Merge commit '
a876958d0fdd8bf10d315175daff12cd7d768053 '
* commit '
a876958d0fdd8bf10d315175daff12cd7d768053 ':
avutil/md5: fix misaligned reads
This commit is a noop, see
e2b7ae4b198c1dc001b3b28476608eaf4daf726c
Merged-by: James Almer <jamrial@gmail.com>
Mark Thompson [Wed, 1 Nov 2017 00:48:56 +0000 (00:48 +0000)]
ffmpeg: Fix flush packet stream copy input timestamp handling
Since
a7da13474286774cf378c3ea606c19a7c1a0eba3 , flush packets are passed
to process_input_packet() during stream copy. This modifies the input
timestamp handling to ignore them - since they contain no data, timestamps
should not be affected.
James Almer [Wed, 1 Nov 2017 19:26:36 +0000 (16:26 -0300)]
Merge commit '
61cec5adaacb358783c18aa07362f15824c1b274 '
* commit '
61cec5adaacb358783c18aa07362f15824c1b274 ':
tls: Hide backend implementation details from users
Also includes
ed434be106a4615e0419b3ac7664220741afda2d
Changes were made to support schannel and securetransport.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 17:13:04 +0000 (14:13 -0300)]
James Almer [Wed, 1 Nov 2017 17:07:48 +0000 (14:07 -0300)]
Merge commit '
b98f082d8ddc0a0d8317114d8414ab51de60ef02 '
* commit '
b98f082d8ddc0a0d8317114d8414ab51de60ef02 ':
smacker: Check that the data size is a multiple of a sample vector
See
4a9af07a49295e014b059c1ab624c40345af5892
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 17:01:54 +0000 (14:01 -0300)]
Merge commit '
2ca759657bcda328acc312e5882a940333a3e268 '
* commit '
2ca759657bcda328acc312e5882a940333a3e268 ':
os_support: Remove the dynamic loading of getaddrinfo from the fallback getaddrinfo
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 16:55:29 +0000 (13:55 -0300)]
doc/libav-merge: mention skipped hlsenc commit
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 16:44:39 +0000 (13:44 -0300)]
Merge commit '
4d444d04c1e19cd02ac836d411433906a9f32613 '
* commit '
4d444d04c1e19cd02ac836d411433906a9f32613 ':
configure: Default to _WIN32_WINNT=0x0502 (XP) as minimum, for legacy mingw
See
69f7aad5710f280ad854ea0bb84d59ed1b55bf5b
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Wed, 1 Nov 2017 16:41:44 +0000 (13:41 -0300)]
Merge commit '
16cb06bb30390c3d74312fc6aead818e19bfd8e4 '
* commit '
16cb06bb30390c3d74312fc6aead818e19bfd8e4 ':
hlsenc: Support recovery from an already present playlist
This commit is a noop. It needs extra work to apply cleanly.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 17:59:08 +0000 (14:59 -0300)]
avformat/mux: be less strict with bitstream filter failures
This makes the autobsf feature behave the same as the manual
bitstream filtering in ffmpeg.c
Fixes ticket #6794
Reviewed-by: rcombs
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 04:01:21 +0000 (01:01 -0300)]
avformat/movenc: let avpriv_ac3_parse_header() allocate the AC3HeaderInfo struct
This removes sizeof(AC3HeaderInfo) from the ABI.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Carl Eugen Hoyos [Wed, 1 Nov 2017 13:15:15 +0000 (14:15 +0100)]
lavc/ppc/h264dsp: Fix function prototype after
bc26fe89 .
Silences the following gcc warnings:
src/libavcodec/ppc/h264dsp.c: In function 'ff_h264dsp_init_ppc':
src/libavcodec/ppc/h264dsp.c:809:40: warning: assignment from incompatible pointer type
src/libavcodec/ppc/h264dsp.c:810:40: warning: assignment from incompatible pointer type
src/libavcodec/ppc/h264dsp.c:811:40: warning: assignment from incompatible pointer type
src/libavcodec/ppc/h264dsp.c:812:40: warning: assignment from incompatible pointer type
Carl Eugen Hoyos [Wed, 1 Nov 2017 12:41:18 +0000 (13:41 +0100)]
lavc/ppc/svq1enc_altivec: Fix function prototype after
dad31083 .
Silences a gcc warning:
src/libavcodec/ppc/svq1enc_altivec.c: In function 'ff_svq1enc_init_ppc':
src/libavcodec/ppc/svq1enc_altivec.c:80:26: warning: assignment from incompatible pointer type
Moritz Barsnick [Wed, 1 Nov 2017 00:30:57 +0000 (01:30 +0100)]
avfilter/vf_ocr: check ff_set_common_formats() return value
Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Carl Eugen Hoyos [Wed, 1 Nov 2017 02:05:51 +0000 (03:05 +0100)]
lavu/murmur3: Enforce usual function attribute order.
Jun Zhao [Tue, 31 Oct 2017 08:12:36 +0000 (16:12 +0800)]
examples/filtering_audio: suppress the build warning.
suppress the "warning: assignment discards ‘const’ qualifier from
pointer target type" build warning.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jun Zhao [Tue, 31 Oct 2017 08:11:06 +0000 (16:11 +0800)]
examples/filtering_video: suppress the build warning.
suppress the "warning: assignment discards ‘const’ qualifier from
pointer target type" build warning.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Jun Zhao [Tue, 31 Oct 2017 08:09:45 +0000 (16:09 +0800)]
examples/transcoding: suppress build warning.
suppress the "warning: assignment discards ‘const’ qualifier from
pointer target type" build warning.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Fri, 27 Oct 2017 13:28:33 +0000 (18:58 +0530)]
avcodec/mips: Improve hevc uni vt and hv mc msa functions
Remove unused macro.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Fri, 27 Oct 2017 13:05:28 +0000 (18:35 +0530)]
avcodec/mips: Improve hevc bi hz and hv mc msa functions
Align the mask buffer.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Kaustubh Raste [Fri, 27 Oct 2017 11:51:17 +0000 (17:21 +0530)]
avcodec/mips: Improve hevc bi weighted copy, hz and vt mc msa functions
Pack the data to half word before clipping.
Use immediate unsigned saturation for clip to max saving one vector register.
Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Sat, 28 Oct 2017 20:52:02 +0000 (22:52 +0200)]
lswr/rematrix: Support s32p.
Fixes ticket #6785.
James Almer [Tue, 31 Oct 2017 23:29:53 +0000 (20:29 -0300)]
avcodec/vp9_superframe_bsf: cache packets by creating new references rather than moving them
Should hopefully fix the invalid reads after free introduced in
e1bc3f4396ade6033787717d3650fb62663eae8 for all targets.
Signed-off-by: James Almer <jamrial@gmail.com>
Aman Gupta [Tue, 31 Oct 2017 23:21:33 +0000 (16:21 -0700)]
lavc/videotoolbox: fix out-of-bounds memory access during hvcc creation
Signed-off-by: Aman Gupta <aman@tmm1.net>
Paul B Mahol [Fri, 27 Oct 2017 15:59:29 +0000 (17:59 +0200)]
avfilter/af_join: switch to activate
Fixes #6780.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 27 Oct 2017 16:18:18 +0000 (18:18 +0200)]
avfilter: pass correct argument to helper function
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Tue, 31 Oct 2017 19:18:32 +0000 (16:18 -0300)]
avcodec/vp9_superframe_bsf: allocate cache of packets during init
Also use av_packet_move_ref() to cache them instead of copying
pointers.
Fixes invalid reads since
e1bc3f4396ade6033787717d3650fb62663eae8 .
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 16:41:37 +0000 (13:41 -0300)]
Merge commit '
91622f6446b463abe6507ad2cd5d1fbf7e49c424 '
* commit '
91622f6446b463abe6507ad2cd5d1fbf7e49c424 ':
avconv: Always initialize the opkt struct on streamcopy
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 16:37:46 +0000 (13:37 -0300)]
Merge commit '
427f7a1f9ec1977bcb57cb4d6e6f7228dc1e858b '
* commit '
427f7a1f9ec1977bcb57cb4d6e6f7228dc1e858b ':
configure: Fix the msvcrt version check for mingw32
This commit is a noop
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 16:21:21 +0000 (13:21 -0300)]
Merge commit '
2017ffc18fe4d33b954dd8a50b086f310f17a329 '
* commit '
2017ffc18fe4d33b954dd8a50b086f310f17a329 ':
vaapi: Add ABGR map only if VA_FOURCC_ABGR is defined
This commit is a noop, see
5aede051202150a1904c0f07a5c7901f402395a5
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 16:11:02 +0000 (13:11 -0300)]
Merge commit '
6a7e928555d081ff86c867867ebce74fdc4c87d6 '
* commit '
6a7e928555d081ff86c867867ebce74fdc4c87d6 ':
configure: Do not check for the __builtin_vec_vsx_ld
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 16:06:53 +0000 (13:06 -0300)]
Merge commit '
3d040513a1de4797a4f81dde4984395f51db76b7 '
* commit '
3d040513a1de4797a4f81dde4984395f51db76b7 ':
avutil/hwcontext_dxva2: Don't improperly free IDirect3DSurface9 objects
decode: fix the code reducing cropping to preserve alignment
This commit is a noop, see
02327d1237f19619272e7b04b715e807c16af6a5
0c1c514643d5e1645160d697fa4c27cd38c7c791
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 15:48:36 +0000 (12:48 -0300)]
Merge commit '
c3f0357bdf7d3c542aad2c58b94184b9f56edc41 '
* commit '
c3f0357bdf7d3c542aad2c58b94184b9f56edc41 ':
hevcdec: move the MD5 context out of HEVCSEIPictureHash back into HEVCContext
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 15:38:36 +0000 (12:38 -0300)]
avcodec/hevc_sei: reorder some parameters in static functions
Cosmetic change skipped in
0b30cb8dae5e7edb2a5f35900547321499c217f1
by mistake.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 15:27:57 +0000 (12:27 -0300)]
avcodec/hevc_sei: rename HEVCSEIContext to HEVCSEI
Cosmetic change skipped in
0b30cb8dae5e7edb2a5f35900547321499c217f1
by mistake.
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 15:13:40 +0000 (12:13 -0300)]
Merge commit '
d7dcd825dea3681c69a35b3147a3b42f1bf078dd '
* commit '
d7dcd825dea3681c69a35b3147a3b42f1bf078dd ':
extract_extradata_bsf: make sure all needed parameter set NALUs were found
This commit is a noop, see
cbd25029399873ef6ff2c7344efbfb0c74b12e37
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 15:09:53 +0000 (12:09 -0300)]
Merge commit '
3fb6b98b5e247434456916c35ba7e08efa03e85d '
* commit '
3fb6b98b5e247434456916c35ba7e08efa03e85d ':
vp9_superframe_bsf: cache input packets directly
Merged-by: James Almer <jamrial@gmail.com>
Nicolas George [Mon, 30 Oct 2017 09:04:55 +0000 (10:04 +0100)]
lavfi/testsrc2: fix hang with very small sizes.
Move a subtraction to the other side of the equal to avoid overflows.
James Almer [Tue, 31 Oct 2017 02:20:51 +0000 (23:20 -0300)]
Merge commit '
126bc2c33b79c36bc23f43719d20f55b9b6771e9 '
* commit '
126bc2c33b79c36bc23f43719d20f55b9b6771e9 ':
vp9_superframe_bsf: convert to the new bitstream reader
This commit is a noop, see
https://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 02:18:43 +0000 (23:18 -0300)]
Merge commit '
3daaa4417317ca732fb00476fdb3308d784f87e4 '
* commit '
3daaa4417317ca732fb00476fdb3308d784f87e4 ':
hevc: Add names for reserved NAL unit types
h264_sei: Add namespace prefix to all SEI values
This commit is a noop, see
6eb102a616364d06a4cc994339b72910b3547e5f
b264810ef7a3fcd7cfc8e232877cfb2fdf7954f6
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 02:07:15 +0000 (23:07 -0300)]
Merge commit '
4d56f7ab8f627aa140c1ede1bb61305f01cefcdd '
* commit '
4d56f7ab8f627aa140c1ede1bb61305f01cefcdd ':
avconv: Flush output BSFs when stream copy reaches EOF
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 00:13:48 +0000 (21:13 -0300)]
Merge commit '
66aa9b94dae217a0fc5acfb704490707629d95ed '
* commit '
66aa9b94dae217a0fc5acfb704490707629d95ed ':
doc: Document hwupload, hwdownload and hwmap filters
This commit is a noop, see
5de38188f82ac21fc645009dbb6c593049eb773d
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 00:09:20 +0000 (21:09 -0300)]
Merge commit '
7c35bee0251efc271c8f7900ce816fcb8ec25d19 '
* commit '
7c35bee0251efc271c8f7900ce816fcb8ec25d19 ':
movenc-test: Add tests for negative cts offsets
movenc: Don't write any edit list if the start offset is zero
This commit is a noop, see
5455a44aa5077bcd33485f424e055807afcefeb5
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 00:06:15 +0000 (21:06 -0300)]
Merge commit '
c380a0d7f7a2c7411aae60463e25d916541f0388 '
* commit '
c380a0d7f7a2c7411aae60463e25d916541f0388 ':
movenc: Add an option for enabling negative CTS offsets
This commit is a noop, see
07e4be7ec94cbd8e674a260c939054f018d337eb
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 00:03:50 +0000 (21:03 -0300)]
Merge commit '
d05c9cde0e87c23ca42957646bea483dfc09d6bf '
* commit '
d05c9cde0e87c23ca42957646bea483dfc09d6bf ':
checkasm: aarch64: Specify alignment for the register_init const array
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 31 Oct 2017 00:00:51 +0000 (21:00 -0300)]
Merge commit '
d7320ca3ed10f0d35b3740fa03341161e74275ea '
* commit '
d7320ca3ed10f0d35b3740fa03341161e74275ea ':
arm: Avoid using .dn register aliases
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 23:58:03 +0000 (20:58 -0300)]
Merge commit '
6ccf76aec73b2cd598bb1e65d126d8a12540c411 '
* commit '
6ccf76aec73b2cd598bb1e65d126d8a12540c411 ':
mpjpeg: Use proper CR/LF in multipart headers
This commit is a noop, see
0d2f4eedc8a46892471c51cbc7a78cd9a489771a
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 23:40:28 +0000 (20:40 -0300)]
Merge commit '
cb167f2947f1a2c446bd8db196d0e64ef4a6d06b '
* commit '
cb167f2947f1a2c446bd8db196d0e64ef4a6d06b ':
h264_refs: validate the SPS pointer in ff_h264_execute_ref_pic_marking()
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 23:08:18 +0000 (20:08 -0300)]
Merge commit '
cfd25488bf35123bdd38ecbe1107a21df2e03c2f '
* commit '
cfd25488bf35123bdd38ecbe1107a21df2e03c2f ':
hevcdec: move SEI message parsing into a separate header
hevcdec: remove HEVCContext usage from hevc_sei
This commit is a noop, see
c4b08c8a4e54b752641d0792d9a73e16e62a0bbc
a687fb997097ac1d1870b6de5160d45e5f57e871
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 23:04:46 +0000 (20:04 -0300)]
Merge commit '
59cee42d7d22530e66a155305389e29679b11f78 '
* commit '
59cee42d7d22530e66a155305389e29679b11f78 ':
arm: Check for the .arch directive in configure
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 22:59:01 +0000 (19:59 -0300)]
Merge commit '
ce080f47b8b55ab3d41eb00487b138d9906d114d '
* commit '
ce080f47b8b55ab3d41eb00487b138d9906d114d ':
hevc: Add NEON 32x32 IDCT
Merged-by: James Almer <jamrial@gmail.com>