summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* lavc/ppc/h264dsp: Fix function prototype after bc26fe89.Carl Eugen Hoyos2017-11-011-2/+2
| | | | | | | | | 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
* lavc/ppc/svq1enc_altivec: Fix function prototype after dad31083.Carl Eugen Hoyos2017-11-011-1/+1
| | | | | | 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
* avfilter/vf_ocr: check ff_set_common_formats() return valueMoritz Barsnick2017-11-011-3/+1
| | | | Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
* lavu/murmur3: Enforce usual function attribute order.Carl Eugen Hoyos2017-11-011-3/+3
|
* examples/filtering_audio: suppress the build warning.Jun Zhao2017-11-011-2/+2
| | | | | | | | | 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>
* examples/filtering_video: suppress the build warning.Jun Zhao2017-11-011-2/+2
| | | | | | | | | 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>
* examples/transcoding: suppress build warning.Jun Zhao2017-11-011-2/+2
| | | | | | | | | 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>
* avcodec/mips: Improve hevc uni vt and hv mc msa functionsKaustubh Raste2017-11-011-245/+499
| | | | | | | | 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>
* avcodec/mips: Improve hevc bi hz and hv mc msa functionsKaustubh Raste2017-11-011-345/+595
| | | | | | | | 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>
* avcodec/mips: Improve hevc bi weighted copy, hz and vt mc msa functionsKaustubh Raste2017-11-011-777/+793
| | | | | | | | | 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>
* lswr/rematrix: Support s32p.Carl Eugen Hoyos2017-11-012-6/+15
| | | | Fixes ticket #6785.
* avcodec/vp9_superframe_bsf: cache packets by creating new references rather ↵James Almer2017-10-311-1/+3
| | | | | | | | | 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>
* lavc/videotoolbox: fix out-of-bounds memory access during hvcc creationAman Gupta2017-10-311-2/+2
| | | | Signed-off-by: Aman Gupta <aman@tmm1.net>
* avfilter/af_join: switch to activatePaul B Mahol2017-10-311-47/+51
| | | | | | Fixes #6780. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter: pass correct argument to helper functionPaul B Mahol2017-10-311-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/vp9_superframe_bsf: allocate cache of packets during initJames Almer2017-10-311-4/+20
| | | | | | | | | 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>
* Merge commit '91622f6446b463abe6507ad2cd5d1fbf7e49c424'James Almer2017-10-311-3/+3
|\ | | | | | | | | | | | | * commit '91622f6446b463abe6507ad2cd5d1fbf7e49c424': avconv: Always initialize the opkt struct on streamcopy Merged-by: James Almer <jamrial@gmail.com>
| * avconv: Always initialize the opkt struct on streamcopyLuca Barbato2017-05-311-3/+3
| |
* | Merge commit '427f7a1f9ec1977bcb57cb4d6e6f7228dc1e858b'James Almer2017-10-310-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '427f7a1f9ec1977bcb57cb4d6e6f7228dc1e858b': configure: Fix the msvcrt version check for mingw32 This commit is a noop Merged-by: James Almer <jamrial@gmail.com>
| * configure: Fix the msvcrt version check for mingw32Martin Storsjö2017-05-311-1/+1
| | | | | | | | | | | | | | | | This was actually broken when committed in 46e3936fb04; the test never succeeded, and thus, _aligned_malloc wasn't actually used on legacy mingw. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2017ffc18fe4d33b954dd8a50b086f310f17a329'James Almer2017-10-310-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * vaapi: Add ABGR map only if VA_FOURCC_ABGR is definedElviss Strazdins2017-05-291-0/+2
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '6a7e928555d081ff86c867867ebce74fdc4c87d6'James Almer2017-10-311-1/+8
|\ \ | |/ | | | | | | | | | | * commit '6a7e928555d081ff86c867867ebce74fdc4c87d6': configure: Do not check for the __builtin_vec_vsx_ld Merged-by: James Almer <jamrial@gmail.com>
| * configure: Do not check for the __builtin_vec_vsx_ldLuca Barbato2017-05-291-1/+8
| | | | | | | | Clang support for Altivec/VSX uses a different approach.
* | Merge commit '3d040513a1de4797a4f81dde4984395f51db76b7'James Almer2017-10-310-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * avutil/hwcontext_dxva2: Don't improperly free IDirect3DSurface9 objectsAaron Levinson2017-05-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dxva2_pool_release_dummy() and use it in call to av_buffer_create() in dxva2_pool_alloc(). Prior to this change, av_buffer_create() was called with NULL for the third argument, which indicates that av_buffer_default_free() should be used to free the buffer's data. Eventually, it gets to buffer_pool_free() and calls buf->free() on a surface object (which is av_buffer_default_free()). This can result in a crash when the debug version of the C-runtime is used on Windows. While it doesn't appear to result in a crash when the release version of the C-runtime is used on Windows, it likely results in memory corruption, since av_free() is being called on memory that was allocated using IDirectXVideoAccelerationService::CreateSurface(). Signed-off-by: Aaron Levinson <alevinsn@aracnet.com> Reviewed-by: wm4 <nfxjfg@googlemail.com> Reviewed-by: Steven Liu <lingjiujianke@gmail.com> Reviewed-by: Mark Thompson <sw@jkqxz.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * decode: fix the code reducing cropping to preserve alignmentAnton Khirnov2017-05-201-1/+7
| | | | | | | | | | | | Currently it does not work at all. Bug-Id: 1058
* | Merge commit 'c3f0357bdf7d3c542aad2c58b94184b9f56edc41'James Almer2017-10-313-9/+8
|\ \ | |/ | | | | | | | | | | * commit 'c3f0357bdf7d3c542aad2c58b94184b9f56edc41': hevcdec: move the MD5 context out of HEVCSEIPictureHash back into HEVCContext Merged-by: James Almer <jamrial@gmail.com>
| * hevcdec: move the MD5 context out of HEVCSEIPictureHash back into HEVCContextAnton Khirnov2017-05-203-9/+8
| | | | | | | | | | | | | | HEVCSEIPictureHash should store only the information extracted from the bitstream and exported to the higher layer (the decoder or the parser). The MD5 context is allocated, used and freed by this higher layer, so it makes more sense for it to also be stored there.
* | avcodec/hevc_sei: reorder some parameters in static functionsJames Almer2017-10-311-10/+9
| | | | | | | | | | | | | | Cosmetic change skipped in 0b30cb8dae5e7edb2a5f35900547321499c217f1 by mistake. Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/hevc_sei: rename HEVCSEIContext to HEVCSEIJames Almer2017-10-317-21/+20
| | | | | | | | | | | | | | Cosmetic change skipped in 0b30cb8dae5e7edb2a5f35900547321499c217f1 by mistake. Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit 'd7dcd825dea3681c69a35b3147a3b42f1bf078dd'James Almer2017-10-310-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * extract_extradata_bsf: make sure all needed parameter set NALUs were foundJames Almer2017-05-201-3/+12
| | | | | | | | | | | | | | | | | | This mimics the behavior of the now unused h264/hevc parser's split() function and fixes decoding some files when extract_extradata bsf is enabled. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '3fb6b98b5e247434456916c35ba7e08efa03e85d'James Almer2017-10-311-31/+21
|\ \ | |/ | | | | | | | | | | * commit '3fb6b98b5e247434456916c35ba7e08efa03e85d': vp9_superframe_bsf: cache input packets directly Merged-by: James Almer <jamrial@gmail.com>
| * vp9_superframe_bsf: cache input packets directlyAnton Khirnov2017-05-201-30/+19
| | | | | | | | Avoids unnecessary allocs+copies and makes the code slightly simpler.
* | lavfi/testsrc2: fix hang with very small sizes.Nicolas George2017-10-311-2/+2
| | | | | | | | Move a subtraction to the other side of the equal to avoid overflows.
* | Merge commit '126bc2c33b79c36bc23f43719d20f55b9b6771e9'James Almer2017-10-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * 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>
| * vp9_superframe_bsf: convert to the new bitstream readerAnton Khirnov2017-05-201-10/+12
| |
* | Merge commit '3daaa4417317ca732fb00476fdb3308d784f87e4'James Almer2017-10-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * hevc: Add names for reserved NAL unit typesMark Thompson2017-05-161-0/+16
| | | | | | | | | | While not yet used, these NAL units do already have some defined semantics and are referred to elsewhere.
| * h264_sei: Add namespace prefix to all SEI valuesMark Thompson2017-05-165-55/+56
| | | | | | | | | | This avoids confusion with equivalent H.265 SEI values when both are being used at the same time.
* | Merge commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd'James Almer2017-10-301-3/+9
|\ \ | |/ | | | | | | | | | | * commit '4d56f7ab8f627aa140c1ede1bb61305f01cefcdd': avconv: Flush output BSFs when stream copy reaches EOF Merged-by: James Almer <jamrial@gmail.com>
| * avconv: Flush output BSFs when stream copy reaches EOFMark Thompson2017-05-161-2/+8
| | | | | | | | | | Same as f64d1100a54d12c78ce436181bb64229c56da6b3, for stream copy rather than encode.
* | Merge commit '66aa9b94dae217a0fc5acfb704490707629d95ed'James Almer2017-10-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '66aa9b94dae217a0fc5acfb704490707629d95ed': doc: Document hwupload, hwdownload and hwmap filters This commit is a noop, see 5de38188f82ac21fc645009dbb6c593049eb773d Merged-by: James Almer <jamrial@gmail.com>
| * doc: Document hwupload, hwdownload and hwmap filtersMark Thompson2017-05-161-0/+98
| |
* | Merge commit '7c35bee0251efc271c8f7900ce816fcb8ec25d19'James Almer2017-10-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * 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>
| * movenc-test: Add tests for negative cts offsetsMartin Storsjö2017-05-152-0/+30
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Don't write any edit list if the start offset is zeroMartin Storsjö2017-05-151-2/+1
| | | | | | | | | | | | In these cases, the CTTS flag is set, but no edit list is necessary. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c380a0d7f7a2c7411aae60463e25d916541f0388'James Almer2017-10-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * 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>
| * movenc: Add an option for enabling negative CTS offsetsMartin Storsjö2017-05-152-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | This reduces the need for an edit list; streams that start with e.g. dts=-1, pts=0 can be encoded as dts=0, pts=0 (which is valid in mov/mp4) by shifting the dts values of all packets forward. This avoids the need for edit lists for such streams (while they still are needed for audio streams with encoder delay). This eases conformance with the DASH-IF interoperability guidelines. Signed-off-by: Martin Storsjö <martin@martin.st>
View Lorry Controller Status