summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * swscale: Properly load alpha for planar rgbMichael Niedermayer2016-10-182-2/+39
| | | | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'James Almer2017-03-231-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9': build: Add VSX-OBJS to SUBDIR_VARS Merged-by: James Almer <jamrial@gmail.com>
| * build: Add VSX-OBJS to SUBDIR_VARSDiego Biurrun2016-10-181-1/+1
| | | | | | | | The variable needs to be reset for each subdirectory.
* | Merge commit '58224dc5f3d4fea40a8d55cca87291a960c11622'James Almer2017-03-232-1/+1
|\ \ | |/ | | | | | | | | | | * commit '58224dc5f3d4fea40a8d55cca87291a960c11622': ppc: avcodec: Drop silly "_ppc" suffixes from files in ppc subdirectories Merged-by: James Almer <jamrial@gmail.com>
| * ppc: avcodec: Drop silly "_ppc" suffixes from files in ppc subdirectoriesDiego Biurrun2016-10-182-1/+1
| |
* | Merge commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2'James Almer2017-03-230-0/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2': vaapi_encode: Write sequence header as extradata This commit is a noop. It has already been cherry-picked in 51020adcecf4004c1586a708d96acc6cbddd050a Merged-by: James Almer <jamrial@gmail.com>
| * vaapi_encode: Write sequence header as extradataMark Thompson2016-10-172-0/+24
| | | | | | | | | | Only works if packed headers are supported, where we can know the output before generating the first frame.
* | Merge commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f'James Almer2017-03-231-1/+1
|\ \ | |/ | | | | | | | | | | * commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f': vaapi_h265: Include header for slice types Merged-by: James Almer <jamrial@gmail.com>
| * vaapi_h265: Include header for slice typesMark Thompson2016-10-171-1/+1
| | | | | | | | | | | | The include was changed correctly in 4abe3b049d987420eb891f74a35af2cebbf52144 but then mistakenly changed back by c359d624d3efc3fd1d83210d78c4152bd329b765 (it's not just the NAL unit types which are used).
* | Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'James Almer2017-03-232-3/+3
|\ \ | |/ | | | | | | | | | | * commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4': x86: Add missing colons after assembly labels Merged-by: James Almer <jamrial@gmail.com>
| * x86: Add missing colons after assembly labelsDiego Biurrun2016-10-178-16/+16
| | | | | | | | | | This fixes many warnings of the sort warning: label alone on a line without a colon might be in error
* | Merge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055'James Almer2017-03-234-4/+3
|\ \ | |/ | | | | | | | | | | * commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055': build: Drop arch-specific checkasm Makefiles Merged-by: James Almer <jamrial@gmail.com>
| * build: Drop arch-specific checkasm MakefilesDiego Biurrun2016-10-174-4/+3
| | | | | | | | They only contain one line and will never contain more.
* | Merge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81'James Almer2017-03-233-14/+9
|\ \ | |/ | | | | | | | | | | * commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81': build: Drop duplicate asm recipe Merged-by: James Almer <jamrial@gmail.com>
| * build: Drop duplicate asm recipeDiego Biurrun2016-10-173-10/+5
| | | | | | | | | | And move the asm recipe to the top-level Makefile next to the other local pattern rules for .o files.
* | Merge commit 'c91d6a33f872574c95c8784277cf60ffcf6bff4f'James Almer2017-03-232-12/+9
|\ \ | |/ | | | | | | | | | | * commit 'c91d6a33f872574c95c8784277cf60ffcf6bff4f': checkasm: aarch64: Add filler args to make sure all parameters are passed on the stack Merged-by: James Almer <jamrial@gmail.com>
| * checkasm: aarch64: Add filler args to make sure all parameters are passed on ↵Martin Storsjö2016-10-162-12/+9
| | | | | | | | | | | | | | | | | | | | the stack This, combined with clobbering the stack space prior to the call, increases the chances of finding cases where 32 bit parameters are erroneously treated as 64 bit. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6'James Almer2017-03-232-1/+18
|\ \ | |/ | | | | | | | | | | * commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6': checkasm: aarch64: Clobber the stack before calling functions Merged-by: James Almer <jamrial@gmail.com>
OpenPOWER on IntegriCloud