summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge commit 'd05c9cde0e87c23ca42957646bea483dfc09d6bf'James Almer2017-10-301-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'd05c9cde0e87c23ca42957646bea483dfc09d6bf': checkasm: aarch64: Specify alignment for the register_init const array Merged-by: James Almer <jamrial@gmail.com>
| * checkasm: aarch64: Specify alignment for the register_init const arrayMartin Storsjö2017-05-151-1/+1
| | | | | | | | | | | | | | Loads from this strictly doesn't require alignment, but specify it just for consistency with the arm version. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'd7320ca3ed10f0d35b3740fa03341161e74275ea'James Almer2017-10-303-25/+5
|\ \ | |/ | | | | | | | | | | * commit 'd7320ca3ed10f0d35b3740fa03341161e74275ea': arm: Avoid using .dn register aliases Merged-by: James Almer <jamrial@gmail.com>
| * arm: Avoid using .dn register aliasesMartin Storsjö2017-05-153-25/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang now (in the upcoming 5.0 version) is capable of building our arm assembly without relying on gas-preprocessor, although clang/LLVM doesn't support .dn register aliases. The VC1 MC assembly was only built and used if the chosen assembler supported the .dn directives though. This was supported as long as gas-preprocessor was used. This means that VC1 decoding got a speed regression on clang 5.0, unless the user manually chose using gas-preprocessor again. By avoiding using the .dn register aliases, we can build the VC1 MC assembly with the latest clang version. Support for the .dn/.qn directives in clang/LLVM isn't actively planned, see https://bugs.llvm.org/show_bug.cgi?id=18199. This partially reverts 896a5bff64264f4d01ed98eacc97a67260c1e17e. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411'James Almer2017-10-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '6ccf76aec73b2cd598bb1e65d126d8a12540c411': mpjpeg: Use proper CR/LF in multipart headers This commit is a noop, see 0d2f4eedc8a46892471c51cbc7a78cd9a489771a Merged-by: James Almer <jamrial@gmail.com>
| * mpjpeg: Use proper CR/LF in multipart headersMartin Storsjö2017-05-111-4/+4
| | | | | | | | | | | | This is more correct. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cb167f2947f1a2c446bd8db196d0e64ef4a6d06b'James Almer2017-10-301-0/+7
|\ \ | |/ | | | | | | | | | | * commit 'cb167f2947f1a2c446bd8db196d0e64ef4a6d06b': h264_refs: validate the SPS pointer in ff_h264_execute_ref_pic_marking() Merged-by: James Almer <jamrial@gmail.com>
| * h264_refs: validate the SPS pointer in ff_h264_execute_ref_pic_marking()Sean McGovern2017-05-091-0/+7
| | | | | | | | | | Bug-Id: 1036 CC: libav-stable@libav.org
* | Merge commit 'cfd25488bf35123bdd38ecbe1107a21df2e03c2f'James Almer2017-10-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * hevcdec: move SEI message parsing into a separate headerJames Almer2017-05-093-61/+95
| | | | | | | | | | | | | | It doesn't depend on hevcdec anymore. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * hevcdec: remove HEVCContext usage from hevc_seiJames Almer2017-05-093-79/+86
| | | | | | | | | | | | | | | | | | | | Based on the H264 SEI implementation. This will be mainly useful once support for SEI messages that can be used by the hevc parser are implemented, like Picture Timing. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '59cee42d7d22530e66a155305389e29679b11f78'James Almer2017-10-302-0/+6
|\ \ | |/ | | | | | | | | | | * commit '59cee42d7d22530e66a155305389e29679b11f78': arm: Check for the .arch directive in configure Merged-by: James Almer <jamrial@gmail.com>
| * arm: Check for the .arch directive in configureMartin Storsjö2017-05-082-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | When targeting windows, the .arch directive isn't available. So far, when building for windows, we've always used gas-preprocessor, both when using msvc's armasm and when using clang. Lately, clang/llvm has implemented the last missing piece (altmacro support) for building our assembly without gas-preprocessor. This means that we now build for arm/windows with clang without any extra compatibility layer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'ce080f47b8b55ab3d41eb00487b138d9906d114d'James Almer2017-10-302-21/+294
|\ \ | |/ | | | | | | | | | | * commit 'ce080f47b8b55ab3d41eb00487b138d9906d114d': hevc: Add NEON 32x32 IDCT Merged-by: James Almer <jamrial@gmail.com>
| * hevc: Add NEON 32x32 IDCTAlexandra Hájková2017-05-042-21/+294
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '118dd4a321a2d67f67c21b076abd0b4d939ab642'James Almer2017-10-301-8/+8
|\ \ | |/ | | | | | | | | | | * commit '118dd4a321a2d67f67c21b076abd0b4d939ab642': hevc: 16x16 NEON idct: Use the right element size for loads/stores Merged-by: James Almer <jamrial@gmail.com>
| * hevc: 16x16 NEON idct: Use the right element size for loads/storesAlexandra Hájková2017-05-041-8/+8
| | | | | | | | | | | | | | This doesn't change the actual behaviour of the code but improves readability. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '504403ab28688588fb85817ad58964482f67f29f'James Almer2017-10-300-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '504403ab28688588fb85817ad58964482f67f29f': aacsbr: Turnoff in the event of over read. This commit is a noop, see 2c8a3aa985acc906ecab37357f2798da7cb9822d Merged-by: James Almer <jamrial@gmail.com>
OpenPOWER on IntegriCloud