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>
James Almer [Mon, 30 Oct 2017 22:56:29 +0000 (19:56 -0300)]
Merge commit '
118dd4a321a2d67f67c21b076abd0b4d939ab642'
* commit '
118dd4a321a2d67f67c21b076abd0b4d939ab642':
hevc: 16x16 NEON idct: Use the right element size for loads/stores
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 22:49:07 +0000 (19:49 -0300)]
Merge commit '
504403ab28688588fb85817ad58964482f67f29f'
* commit '
504403ab28688588fb85817ad58964482f67f29f':
aacsbr: Turnoff in the event of over read.
This commit is a noop, see
2c8a3aa985acc906ecab37357f2798da7cb9822d
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 21:56:45 +0000 (18:56 -0300)]
Merge commit '
b5f19f7478492307e4b4763aeac3180faf50e17f'
* commit '
b5f19f7478492307e4b4763aeac3180faf50e17f':
aac: Split function to parse ADTS header data into public and private part
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 21:10:06 +0000 (18:10 -0300)]
Merge commit '
0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c'
* commit '
0ac1fec1c3dacedabbf3dd4122ef4bf8523e688c':
bitstream: Move VLC reading functions into the vlc.h header
vlc: Add header #include when the types are used
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 [Mon, 30 Oct 2017 21:06:34 +0000 (18:06 -0300)]
Merge commit '
edbf0fffb15dde7a1de70b05855529d5fc769f14'
* commit '
edbf0fffb15dde7a1de70b05855529d5fc769f14':
hevc: Add NEON add_residual for bitdepth 10
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 21:00:28 +0000 (18:00 -0300)]
Merge commit '
81a4cb8e58636d4efd200c2b4fec786a7e948d8b'
* commit '
81a4cb8e58636d4efd200c2b4fec786a7e948d8b':
vf_hwmap: Add reverse mapping for hardware frames
vf_hwmap: Add device derivation
hwcontext: Improve allocation in derived contexts
hwcontext_qsv: Implement mapping frames to the child device type
hwcontext_qsv: Implement mapping frames from the child device type
hwcontext: Add frame context mapping for nontrivial contexts
hwcontext_qsv: Support derivation from child devices
avconv: Support setting the hardware device to use when filtering
avconv_hw: Add implicit device creation with default parameters
vp9_raw_reorder_bsf: Remove a redundant allocation
This commit is a noop, see
49419925d33304ff907075289808226a695ff57b
06043cc0bc72b530db352a67776392cf61a54104
7ce47090ce36fbe72f807d1e35fea3a699adad17
045ff8d30a6942b72c8be064c3b8415b037dab02
ec3dbeae8139a8bbd8b0fa4514a3cf349de7f335
f82ace71c0d8dd6500daa7ccce5b1fece8a95341
a97fb14418fd621defec1ea5cd387953407b180d
d59c6a3aebc20cc64cb7a46401cb55f02f4cbe09
b2ef1f42badd1c5731816a3959b6dbb62187dbcc
d81be0a60a6dea2bc48ec29f9466eee63984ed34
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 20:47:21 +0000 (17:47 -0300)]
Merge commit '
831018b0bbe26a603802a9022472f714a59293be'
* commit '
831018b0bbe26a603802a9022472f714a59293be':
mpeg4audio: Make avpriv_copy_pce_data() inline
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 20:41:08 +0000 (17:41 -0300)]
Merge commit '
e1c2453a4fac1f7116244d0d05310935c20887e6'
* commit '
e1c2453a4fac1f7116244d0d05310935c20887e6':
arm: hevc_idct: Tune the add_res_8x8 and add_res_32x32 functions
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 20:38:57 +0000 (17:38 -0300)]
Kaustubh Raste [Fri, 27 Oct 2017 11:33:01 +0000 (17:03 +0530)]
avcodec/mips: Improve avc chroma avg hv mc msa functions
Replace generic with block size specific function.
Load the specific destination bytes instead of MSA load and pack.
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:31:26 +0000 (17:01 +0530)]
avcodec/mips: Improve avc avg mc 22, 11, 31, 13 and 33 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>
Michael Niedermayer [Fri, 27 Oct 2017 00:23:21 +0000 (02:23 +0200)]
avcodec/aacdec_fixed: Fix integer overflow in apply_dependent_coupling_fixed()
Fixes: runtime error: signed integer overflow: 623487 *
536870912 cannot be represented in type 'int'
Fixes: 3594/clusterfuzz-testcase-minimized-
4650622935629824
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 [Fri, 27 Oct 2017 00:23:20 +0000 (02:23 +0200)]
avcodec/aacdec_fixed: Fix integer overflow in predict()
Fixes: runtime error: signed integer overflow: -
2110708110 + -
82837504 cannot be represented in type 'int'
Fixes: 3547/clusterfuzz-testcase-minimized-
6009386439802880
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 03:08:17 +0000 (04:08 +0100)]
ffmpeg: Fix stored encoder metadata with -bitexact
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Mon, 30 Oct 2017 20:20:45 +0000 (17:20 -0300)]
Merge commit '
970c76f32283bddf3a5afd24fe52db7a96186244'
* commit '
970c76f32283bddf3a5afd24fe52db7a96186244':
mlp_parser: Drop in-parser downmix functionality
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 20:18:20 +0000 (17:18 -0300)]
Merge commit '
dd3aa85b68c017c419acb0c39ff6aa890ce89e87'
* commit '
dd3aa85b68c017c419acb0c39ff6aa890ce89e87':
aac_ac3_parser: Drop in-parser downmix functionality
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 20:14:39 +0000 (17:14 -0300)]
Merge commit '
c7bf98d4372e9217c8d75d2ca1f298385909e4da'
* commit '
c7bf98d4372e9217c8d75d2ca1f298385909e4da':
avprobe: use av_spherical_projection_name() to print spherical projection names
dump: use av_spherical_projection_name() to print spherical projection names
spherical: add functions to retrieve and request projection names
This commit is a noop, see
9033e8723c86ed31872b22bd576602d48e2b9d0e
2efb70c37992b16b589e7405cd36e2f15a34c8ec
2a2854f57842e843ae0d4bd0ebe617135b2f63a0
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 20:02:43 +0000 (17:02 -0300)]
Merge commit '
7acb90333a187b0e847b66f9d3511245423dc0ce'
* commit '
7acb90333a187b0e847b66f9d3511245423dc0ce':
vaapi: Add external control of allow-profile-mismatch
lavc: Add flag to allow profile mismatch with hardware decoding
vaapi_encode: Use gop_size consistently in RC parameters
This commit is a noop, see
b658b5399e5d75cec44b09d79b00f59fa83cca43
49ae8a5e87f99b15514f5ef075d801e9ea8374e9
38820631746f86a2252c71ed4a588eb679dd9f40
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 19:57:28 +0000 (16:57 -0300)]
Merge commit '
85c2bf9d2cc7dad3d5c6dc79f802a74efa8d8fce'
* commit '
85c2bf9d2cc7dad3d5c6dc79f802a74efa8d8fce':
avfoundation: update to use AVCodecParameters
This commit is a noop, see
f1560dbb2a0089d63ca61a324673f7e2e30fb517
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 19:52:36 +0000 (16:52 -0300)]
Merge commit '
94c54d97e7f4fe90570c323803f2bdf6246c1010'
* commit '
94c54d97e7f4fe90570c323803f2bdf6246c1010':
mlp: Factor out channel layout subset checks
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 19:51:20 +0000 (16:51 -0300)]
Merge commit '
cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425'
* commit '
cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425':
mlp: Drop ff_ prefix from a static function
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 19:40:11 +0000 (16:40 -0300)]
Merge commit '
1f6e5dd4d4dd9c02371ad211049d27edb6d95286'
* commit '
1f6e5dd4d4dd9c02371ad211049d27edb6d95286':
mlp: Rename the channel layout variable
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 19:36:06 +0000 (16:36 -0300)]
Merge commit '
bee89ed3ec61a4a0e72255ae6f4a4274d25b5ccd'
* commit '
bee89ed3ec61a4a0e72255ae6f4a4274d25b5ccd':
matroskaenc: don't warn about unknown spherical metadata when there isn't any
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 19:08:14 +0000 (16:08 -0300)]
Merge commit '
04b0f0e371ff81b682274b574fb465ba4395c09f'
* commit '
04b0f0e371ff81b682274b574fb465ba4395c09f':
mem: uninline av_malloc(z)_array()
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 19:03:27 +0000 (16:03 -0300)]
Merge commit '
3d69dd65c6771c28d3bf4e8e53a905aa8cd01fd9'
* commit '
3d69dd65c6771c28d3bf4e8e53a905aa8cd01fd9':
hevc: Add support for bitdepth 10 for IDCT DC
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 18:58:34 +0000 (15:58 -0300)]
Merge commit '
358adef0305618219522858e471edf7e0cb4043e'
* commit '
358adef0305618219522858e471edf7e0cb4043e':
hevc: Add NEON IDCT DC functions for bitdepth 8
See
03cecf45c134ebbaecb62505fe444ade423ea7dc
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 18:51:41 +0000 (15:51 -0300)]
Merge commit '
d0ce0634e09403eecaea4283cf82a2c5cea7d1e1'
* commit '
d0ce0634e09403eecaea4283cf82a2c5cea7d1e1':
clearvideo: 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 [Mon, 30 Oct 2017 18:46:23 +0000 (15:46 -0300)]
James Almer [Mon, 30 Oct 2017 17:58:39 +0000 (14:58 -0300)]
Merge commit '
c55f2ae2b8d4de473f945aebd6a7a89b6b83e87a'
* commit '
c55f2ae2b8d4de473f945aebd6a7a89b6b83e87a':
avprobe: Handle unknown values for the color description
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 29 Oct 2017 15:42:18 +0000 (12:42 -0300)]
avcodec/avcodec.h: remove doxy from the old bsf API functions
Make it clear that these are deprecated and the new API should be
used instead.
As a side effect, this slightly reduces differences with libav.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 17:31:42 +0000 (14:31 -0300)]
Merge commit '
b812db66af160bfac2f64aef2ade4aed7eb76b12'
* commit '
b812db66af160bfac2f64aef2ade4aed7eb76b12':
utvideodec: Fix gradient prediction when stride does not match width
This commit is a noop, see
49255370044cf4a58c81a88cb8206aee62086346
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 17:20:58 +0000 (14:20 -0300)]
Merge commit '
7c25523cc8e618e77dc84d960e41e9644eaf8c33'
* commit '
7c25523cc8e618e77dc84d960e41e9644eaf8c33':
utvideodec: Fix decoding odd sizes with interlaced video with some formats
See
9ef21a897c64417a0575cbc6fad6222f3163d103
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 17:17:33 +0000 (14:17 -0300)]
Merge commit '
8c0cadd17e98547d84e82111550caca4fb40ff8d'
* commit '
8c0cadd17e98547d84e82111550caca4fb40ff8d':
avplay: Do not try to allocate new frames when the player is closing
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 17:10:44 +0000 (14:10 -0300)]
Merge commit '
41262498ff89ef48e5ce4823b2fc2dc514a3eb0c'
* commit '
41262498ff89ef48e5ce4823b2fc2dc514a3eb0c':
configure: Fix sem_timedwait probe
This commit is a noop. see
abb5efca263daff670ebb0a07af4fc902e457ade
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 16:55:41 +0000 (13:55 -0300)]
Merge commit '
44aafa3325ec09a120bdb81b8579b8dfd65b1693'
* commit '
44aafa3325ec09a120bdb81b8579b8dfd65b1693':
configure: Properly escape arguments in filter/filter_out helper functions
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 16:53:00 +0000 (13:53 -0300)]
Merge commit '
3889dfde9c0284b008c5cfcbc921c1d137fb81e2'
* commit '
3889dfde9c0284b008c5cfcbc921c1d137fb81e2':
dca: Move the downmix request check outside the loop
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 16:29:09 +0000 (13:29 -0300)]
Merge commit '
2e1ab6a67dd5d9a30558d008aa6e541c68d76221'
* commit '
2e1ab6a67dd5d9a30558d008aa6e541c68d76221':
vc1dec: raise an error if sprite picture data is missing
This commit is a noop, see
30f680ee0a2707af9a649a0aa3fd951d18a25c05
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 16:24:51 +0000 (13:24 -0300)]
Merge commit '
ecc5c4db2dd3a0f328d95df89daa59f78b4b2810'
* commit '
ecc5c4db2dd3a0f328d95df89daa59f78b4b2810':
doc/examples/output: Cast pointer to the right (const) type
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 16:20:30 +0000 (13:20 -0300)]
Merge commit '
f25609ff06b093d82548c92fc2031cd2e66c20d3'
* commit '
f25609ff06b093d82548c92fc2031cd2e66c20d3':
doc/examples/filter_audio: const correctness
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 15:33:01 +0000 (12:33 -0300)]
Merge commit '
0fd0d4fd0a518e30ff23972828ad7cf7f35cfb9d'
* commit '
0fd0d4fd0a518e30ff23972828ad7cf7f35cfb9d':
swscale-test: const correctness
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 14:48:14 +0000 (11:48 -0300)]
avdevice/libndi_newtek_dec: remove extra bracket
Fixes compilation broken in
2245476e5c451552f8f32a4a881f6b4968898a47
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 14:47:03 +0000 (11:47 -0300)]
avdevice/decklink_dec: remove extra bracket
Fixes compilation broken in
2245476e5c451552f8f32a4a881f6b4968898a47
Fixes ticket #6791
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Mon, 30 Oct 2017 01:21:46 +0000 (22:21 -0300)]
x86/bswapdsp: add missing preprocessor wrappers for AVX2 functions
Fixes build with old nasm/yasm.
Signed-off-by: James Almer <jamrial@gmail.com>
Anton Khirnov [Fri, 13 Oct 2017 16:59:16 +0000 (18:59 +0200)]
decode: avoid leaks on failure in ff_get_buffer()
If the get_buffer() call fails, the frame might have some side data
already set. Make sure it gets freed.
Merges Libav commit
de77671438c24ffea93398c8dc885d4dd04477de.
Signed-off-by: James Almer <jamrial@gmail.com>
wm4 [Fri, 13 Oct 2017 16:59:15 +0000 (18:59 +0200)]
lavc/avrndec: remove AV_CODEC_CAP_DR1, as it's broken
In the is_mjpeg case, the user's get_buffer2 callback is not called,
thus completely breaking the API.
Signed-off-by: James Almer <jamrial@gmail.com>
Jonas Licht [Sun, 29 Oct 2017 11:11:39 +0000 (12:11 +0100)]
libavformat/mov.c: use calculated dts offset when seeking in streams
Subtract the calculated dts offset from the requested timestamp before
seeking. This fixes an error "Error while filtering: Operation not
permitted" observed with a short file which contains only one key frame
and starts with negative timestamps.
Then, av_index_search_timestamp() returns a valid negative timestamp,
but mov_seek_stream bails out with AVERROR_INVALIDDATA.
Fixes ticket #6139.
Signed-off-by: Jonas Licht <jonas.licht@fem.tu-ilmenau.de>
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Lukas Stabe [Sun, 29 Oct 2017 10:35:57 +0000 (11:35 +0100)]
movenc: add m4b to ipod format extensions
m4b is commonly used as extension for m4a audiobook files.
The format is exactly the same. The only thing that differs
is the extension.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>