summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit '99aeae20de4d09ea313fdc619d4e2df825155e62'Clément Bœsch2017-03-240-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '99aeae20de4d09ea313fdc619d4e2df825155e62': scale_npp: fix passthrough mode This commit is a noop, see f524275ef93882f27c0067e85e8fb3c0fc1a762b Merged-by: Clément Bœsch <u@pkh.me>
| * scale_npp: fix passthrough modeYogender Gupta2016-10-251-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '0aec37e625821040c103641eec9c1e7a1efa2952'Clément Bœsch2017-03-240-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '0aec37e625821040c103641eec9c1e7a1efa2952': vaapi_decode: Remove vestigial unmap code vaapi_decode: Clear parameter buffers to fix picture reuse This merge is a noop, see 79307ae56374b35cf12563a7c8e3e759658f847e Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_decode: Remove vestigial unmap codeMark Thompson2016-10-241-4/+1
| | | | | | | | | | | | | | The buffer map/unmap code was in an early version of this before it was committed, but the unmap was never removed. While wrong, this was harmless (and therefore unnoticed) because the buffers can't be mapped at this point - all drivers just did nothing with the call.
| * vaapi_decode: Clear parameter buffers to fix picture reuseMark Thompson2016-10-241-0/+1
| | | | | | | | | | | | When decoding interlaced pictures, the structure is reused to render to the same surface twice. The parameter buffers were not being cleared, which caused the i965 driver to error out.
* | Merge commit '754b20d7ebccbe8d316b12128c8cb433d5a516ac'Clément Bœsch2017-03-240-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '754b20d7ebccbe8d316b12128c8cb433d5a516ac': vaapi_h264: fix RefPicList[] field flags. This commit is a noop, see 88325c2e0b63abf4c3482cecd43870015123764a Merged-by: Clément Bœsch <u@pkh.me>
| * vaapi_h264: fix RefPicList[] field flags.Gwenole Beauchesne2016-10-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | Use new H264Ref.reference field to track field picture flags. The H264Picture.reference flag in DPB is now irrelevant here. This is a regression from git commit a12d3188, and that affected multiple interlaced video streams. Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* | Merge commit 'ee050797664c7c74cae262ffab05006b55d47a11'Clément Bœsch2017-03-241-10/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit 'ee050797664c7c74cae262ffab05006b55d47a11': openssl: Support version 1.1.0. This commit is mostly a noop, see 798c6ecce50f26a53d48e2577a34fabe46b32eb9 Included the simplifications by Martin Storsjö and fixed the GET_BIO_DATA() macro to prevent a warning after the simplifications. Merged-by: Clément Bœsch <u@pkh.me>
| * openssl: Support version 1.1.0.Matt Oliver2016-10-232-3/+37
| | | | | | | | | | | | | | Further simplifications by Martin Storsjö, to minimize the diff. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'Clément Bœsch2017-03-242-57/+52
|\ \ | |/ | | | | | | | | | | * commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94': rtmpdh: Don't use the OpenSSL DH struct Merged-by: Clément Bœsch <u@pkh.me>
| * rtmpdh: Don't use the OpenSSL DH structMartin Storsjö2016-10-232-57/+52
| | | | | | | | | | | | | | | | | | Instead use our own struct, which we already use when using gcrypt and gnutls. In OpenSSL 1.1, the DH struct has been made opaque. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2f806622e1270d3ed1d41a53049a19673dafbe70'Clément Bœsch2017-03-241-1/+2
|\ \ | |/ | | | | | | | | | | * commit '2f806622e1270d3ed1d41a53049a19673dafbe70': bktr: Use memset(0) instead of zero initialization for struct sigaction Merged-by: Clément Bœsch <u@pkh.me>
| * bktr: Use memset(0) instead of zero initialization for struct sigactionDiego Biurrun2016-10-221-1/+2
| | | | | | | | | | | | | | | | sigaction is not defined in standards as a struct starting with another struct. Some *BSD variants do however, resulting in a warning from the zero initialization, which this change eliminates. This partially reverts a92be9b856bd11b081041c43c25d442028fe9a63.
* | Merge commit 'ed48a9d8143d2575a4458589cebde69ec326afd8'Clément Bœsch2017-03-244-1/+88
|\ \ | |/ | | | | | | | | | | * commit 'ed48a9d8143d2575a4458589cebde69ec326afd8': checkasm: Add a test for HEVC add_residual Merged-by: Clément Bœsch <u@pkh.me>
| * checkasm: Add a test for HEVC add_residualAlexandra Hájková2016-10-224-2/+89
| |
* | Merge commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b'Clément Bœsch2017-03-245-168/+163
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b': hevc: x86: Add add_residual() SIMD optimizations See a6af4bf64dae46356a5f91537a1c8c5f86456b37 This merge is only cosmetics (renames, space shuffling, etc). The functionnal changes in the ASM are *not* merged: - unrolling with %rep is kept - ADD_RES_MMX_4_8 is left untouched: this needs investigation Merged-by: Clément Bœsch <u@pkh.me>
| * hevc: x86: Add add_residual() SIMD optimizationsPierre Edouard Lepere2016-10-224-4/+416
| | | | | | | | | | | | | | Initially written by Pierre Edouard Lepere <Pierre-Edouard.Lepere@insa-rennes.fr>, extended by James Almer <jamrial@gmail.com>. Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
* | lavc/x86/hevc: rename hevc_res_add to hevc_add_resClément Bœsch2017-03-242-2/+2
| | | | | | | | This will simplify incoming merge.
* | Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'Clément Bœsch2017-03-2410-92/+95
|\ \ | |/ | | | | | | | | | | | | | | * commit '043b0b9fb1481053b712d06d2c5b772f1845b72b': Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|v The merge also includes all our own occurences. Merged-by: Clément Bœsch <u@pkh.me>
| * Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|vDiego Biurrun2016-10-223-8/+11
| |
* | Merge commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e'Clément Bœsch2017-03-241-3/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e': mov: Update colr values Mostly noop, see a3cab3d43387add8914c1c471fc99d733227d81b Only the use of av_color_{primaries,transfer,space}_name() is merged. Merged-by: Clément Bœsch <u@pkh.me>
| * mov: Update colr valuesVittorio Giovara2016-10-211-7/+11
| | | | | | | | | | | | | | | | | | | | For 'nclx', the latest edition of the standard switched from JPEG XR to 23001-8, which matches the current order of our entries. Bounds are preserved as a sanity check. For 'nclc', qtff edition 2016-09-13 introduced a few new entries. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104'Clément Bœsch2017-03-245-2/+5
|\ \ | |/ | | | | | | | | | | * commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104': lavu: Add JEDEC P22 color primaries Merged-by: Clément Bœsch <u@pkh.me>
| * lavu: Add JEDEC P22 color primariesVittorio Giovara2016-10-215-2/+5
| |
* | lavu/pixfmt: fix redundant commentClément Bœsch2017-03-241-1/+1
| | | | | | | | Mistake introduced in a1f6b1d9d816ad7e6a8f071b0efa2638bc80e65e.
* | Merge commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c'James Almer2017-03-231-1/+6
|\ \ | |/ | | | | | | | | | | * commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c': Makefile: fix checking whether reconfiguring is required Merged-by: James Almer <jamrial@gmail.com>
| * Makefile: fix checking whether reconfiguring is requiredAnton Khirnov2016-10-211-1/+6
| | | | | | | | | | It didn't take into account the new pattern used for bitstream filters and protocols.
* | Merge commit '59c90097a0eff0dc81fbec15b8900c929859d1e7'James Almer2017-03-230-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '59c90097a0eff0dc81fbec15b8900c929859d1e7': hevc: factor out a repeated condition This commit is a noop. It doesn't apply as our codebase has diverged too much. Merged-by: James Almer <jamrial@gmail.com>
| * hevc: factor out a repeated conditionAnton Khirnov2016-10-211-12/+8
| |
* | sws/tests/pixdesc_query: remove func wrappersClément Bœsch2017-03-241-42/+17
| |
* | sws: make is{RGB,BGR}inInt functionsClément Bœsch2017-03-241-39/+43
| |
* | Merge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'James Almer2017-03-239-59/+61
|\ \ | |/ | | | | | | | | | | * commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f': hevc: move the SliceType enum to hevc.h Merged-by: James Almer <jamrial@gmail.com>
| * hevc: move the SliceType enum to hevc.hAnton Khirnov2016-10-217-52/+54
| | | | | | | | | | Those values are decoder-independent and are also use by the VA-API encoder.
* | doc/libav-merge: add a line about the extract_extradata commitsJames Almer2017-03-231-0/+1
| |
* | Merge commit '096a8effa3f8f3455292c958c3ed07e798def7bd'James Almer2017-03-230-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '096a8effa3f8f3455292c958c3ed07e798def7bd': lavf: check that the codec is supported by extract_extradata This commit is a noop. The code it changes was reverted. See 40fa9d416a2597b1f8a1b9096bfaf05ad367999c Merged-by: James Almer <jamrial@gmail.com>
| * lavf: check that the codec is supported by extract_extradataAnton Khirnov2016-10-211-0/+10
| | | | | | | | | | Avoids superfluous error message spam after 8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4
* | Revert "Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'"James Almer2017-03-232-119/+13
| | | | | | | | | | | | | | | | This reverts commit 1c193ac1f9cfe703d6a1c36795f309ba5d14bf6e, reversing changes made to 7ebc9f8df4035ecaa84ad4429480986e3e7597ae. Several FATE tests started failing after this merge, so it's reverted until it can be properly fixed.
* | Merge commit '788544ff0ed6fe67fda80ad6d3a0796ace035584'James Almer2017-03-230-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit '788544ff0ed6fe67fda80ad6d3a0796ace035584': audiodsp: x86: Remove pointless header file This commit is a noop, see 6ec3dc97fcd27b619621cfb7313ce94764b16a93 Merged-by: James Almer <jamrial@gmail.com>
| * audiodsp: x86: Remove pointless header fileDiego Biurrun2016-10-192-26/+3
| | | | | | | | | | Its single forward declaration can be moved to the only place it is used, like is done for all other dsp init files.
* | Merge commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e'James Almer2017-03-231-5/+5
|\ \ | |/ | | | | | | | | | | * commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e': configure: Print warnings after all other output Merged-by: James Almer <jamrial@gmail.com>
| * configure: Print warnings after all other outputDiego Biurrun2016-10-191-2/+2
| |
* | Merge commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9'James Almer2017-03-231-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9': x86: videodsp: Add parentheses to expression to work around warning Merged-by: James Almer <jamrial@gmail.com>
| * x86: videodsp: Add parentheses to expression to work around warningDiego Biurrun2016-10-191-1/+1
| | | | | | | | libavcodec/x86/videodsp.asm:128: warning: signed dword value exceeds bounds
* | Merge commit 'da4f8c8e35a867f2d9fed0fb75e16c81ab968637'James Almer2017-03-230-0/+0
|\ \ | |/ | | | | | | | | | | | | | | * commit 'da4f8c8e35a867f2d9fed0fb75e16c81ab968637': fate: Update filter-pixfmts-scale gbrap12le hash missing from be9dba5c8a This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * fate: Update filter-pixfmts-scale gbrap12le hash missing from be9dba5c8aLuca Barbato2016-10-181-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'James Almer2017-03-231-2/+2
|\ \ | |/ | | | | | | | | | | * commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b': checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber Merged-by: James Almer <jamrial@gmail.com>
| * checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobberMartin Storsjö2016-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | x29 (FP) is a callee saved register and should be restored on return. Instead of backing up x29 and restoring it here, back up sp in a register that we are allowed to overwrite. This fixes crashes in checkasm on aarch64 since f1b3e1313851. For some reason, gcc builds didn't crash, but clang builds do. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'James Almer2017-03-232-4/+4
|\ \ | |/ | | | | | | | | | | * commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8': emms: Give apriv_emms_yasm() a more general name Merged-by: James Almer <jamrial@gmail.com>
| * emms: Give apriv_emms_yasm() a more general nameDiego Biurrun2016-10-182-4/+4
| |
* | Merge commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d'James Almer2017-03-230-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d': swscale: Properly load alpha for planar rgb This commit is a noop, see 4170a44bbc7b8dfbe9fe2fa28557fce90d998887 df36257a53561a51af969a6ea6319dd2579509b9 Merged-by: James Almer <jamrial@gmail.com>
OpenPOWER on IntegriCloud