ffmpeg.git
2 years agoMerge commit '754b20d7ebccbe8d316b12128c8cb433d5a516ac'
Clément Bœsch [Fri, 24 Mar 2017 12:01:56 +0000 (13:01 +0100)]
Merge commit '754b20d7ebccbe8d316b12128c8cb433d5a516ac'

* commit '754b20d7ebccbe8d316b12128c8cb433d5a516ac':
  vaapi_h264: fix RefPicList[] field flags.

This commit is a noop, see 88325c2e0b63abf4c3482cecd43870015123764a

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'ee050797664c7c74cae262ffab05006b55d47a11'
Clément Bœsch [Fri, 24 Mar 2017 11:57:46 +0000 (12:57 +0100)]
Merge commit 'ee050797664c7c74cae262ffab05006b55d47a11'

* 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>
2 years agoMerge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'
Clément Bœsch [Fri, 24 Mar 2017 11:43:49 +0000 (12:43 +0100)]
Merge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'

* commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94':
  rtmpdh: Don't use the OpenSSL DH struct

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '2f806622e1270d3ed1d41a53049a19673dafbe70'
Clément Bœsch [Fri, 24 Mar 2017 11:40:51 +0000 (12:40 +0100)]
Merge commit '2f806622e1270d3ed1d41a53049a19673dafbe70'

* commit '2f806622e1270d3ed1d41a53049a19673dafbe70':
  bktr: Use memset(0) instead of zero initialization for struct sigaction

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'ed48a9d8143d2575a4458589cebde69ec326afd8'
Clément Bœsch [Fri, 24 Mar 2017 11:37:09 +0000 (12:37 +0100)]
Merge commit 'ed48a9d8143d2575a4458589cebde69ec326afd8'

* commit 'ed48a9d8143d2575a4458589cebde69ec326afd8':
  checkasm: Add a test for HEVC add_residual

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b'
Clément Bœsch [Fri, 24 Mar 2017 11:29:21 +0000 (12:29 +0100)]
Merge commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b'

* 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>
2 years agolavc/x86/hevc: rename hevc_res_add to hevc_add_res
Clément Bœsch [Fri, 24 Mar 2017 10:45:23 +0000 (11:45 +0100)]
lavc/x86/hevc: rename hevc_res_add to hevc_add_res

This will simplify incoming merge.

2 years agoMerge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'
Clément Bœsch [Fri, 24 Mar 2017 10:37:44 +0000 (11:37 +0100)]
Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'

* 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>
2 years agoMerge commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e'
Clément Bœsch [Fri, 24 Mar 2017 10:31:30 +0000 (11:31 +0100)]
Merge commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e'

* 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>
2 years agoMerge commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104'
Clément Bœsch [Fri, 24 Mar 2017 10:20:41 +0000 (11:20 +0100)]
Merge commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104'

* commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104':
  lavu: Add JEDEC P22 color primaries

Merged-by: Clément Bœsch <u@pkh.me>
2 years agolavu/pixfmt: fix redundant comment
Clément Bœsch [Fri, 24 Mar 2017 10:17:51 +0000 (11:17 +0100)]
lavu/pixfmt: fix redundant comment

Mistake introduced in a1f6b1d9d816ad7e6a8f071b0efa2638bc80e65e.

2 years agoMerge commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c'
James Almer [Thu, 23 Mar 2017 23:54:20 +0000 (20:54 -0300)]
Merge commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c'

* commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c':
  Makefile: fix checking whether reconfiguring is required

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '59c90097a0eff0dc81fbec15b8900c929859d1e7'
James Almer [Thu, 23 Mar 2017 23:49:24 +0000 (20:49 -0300)]
Merge commit '59c90097a0eff0dc81fbec15b8900c929859d1e7'

* 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>
2 years agosws/tests/pixdesc_query: remove func wrappers
Clément Bœsch [Thu, 23 Mar 2017 21:46:28 +0000 (22:46 +0100)]
sws/tests/pixdesc_query: remove func wrappers

2 years agosws: make is{RGB,BGR}inInt functions
Clément Bœsch [Thu, 23 Mar 2017 21:51:15 +0000 (22:51 +0100)]
sws: make is{RGB,BGR}inInt functions

2 years agoMerge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'
James Almer [Thu, 23 Mar 2017 23:02:11 +0000 (20:02 -0300)]
Merge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'

* commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f':
  hevc: move the SliceType enum to hevc.h

Merged-by: James Almer <jamrial@gmail.com>
2 years agodoc/libav-merge: add a line about the extract_extradata commits
James Almer [Thu, 23 Mar 2017 22:49:09 +0000 (19:49 -0300)]
doc/libav-merge: add a line about the extract_extradata commits

2 years agoMerge commit '096a8effa3f8f3455292c958c3ed07e798def7bd'
James Almer [Thu, 23 Mar 2017 22:41:50 +0000 (19:41 -0300)]
Merge commit '096a8effa3f8f3455292c958c3ed07e798def7bd'

* 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>
2 years agoRevert "Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'"
James Almer [Thu, 23 Mar 2017 22:34:00 +0000 (19:34 -0300)]
Revert "Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'"

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.

2 years agoMerge commit '788544ff0ed6fe67fda80ad6d3a0796ace035584'
James Almer [Thu, 23 Mar 2017 21:45:56 +0000 (18:45 -0300)]
Merge commit '788544ff0ed6fe67fda80ad6d3a0796ace035584'

* commit '788544ff0ed6fe67fda80ad6d3a0796ace035584':
  audiodsp: x86: Remove pointless header file

This commit is a noop, see 6ec3dc97fcd27b619621cfb7313ce94764b16a93

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e'
James Almer [Thu, 23 Mar 2017 21:41:46 +0000 (18:41 -0300)]
Merge commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e'

* commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e':
  configure: Print warnings after all other output

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9'
James Almer [Thu, 23 Mar 2017 21:35:49 +0000 (18:35 -0300)]
Merge commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9'

* commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9':
  x86: videodsp: Add parentheses to expression to work around warning

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'da4f8c8e35a867f2d9fed0fb75e16c81ab968637'
James Almer [Thu, 23 Mar 2017 21:33:50 +0000 (18:33 -0300)]
Merge commit 'da4f8c8e35a867f2d9fed0fb75e16c81ab968637'

* commit 'da4f8c8e35a867f2d9fed0fb75e16c81ab968637':
  fate: Update filter-pixfmts-scale gbrap12le hash missing from be9dba5c8a

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'
James Almer [Thu, 23 Mar 2017 21:31:36 +0000 (18:31 -0300)]
Merge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'

* commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b':
  checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'
James Almer [Thu, 23 Mar 2017 21:28:56 +0000 (18:28 -0300)]
Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'

* commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8':
  emms: Give apriv_emms_yasm() a more general name

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d'
James Almer [Thu, 23 Mar 2017 21:27:01 +0000 (18:27 -0300)]
Merge commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d'

* commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d':
  swscale: Properly load alpha for planar rgb

This commit is a noop, see
4170a44bbc7b8dfbe9fe2fa28557fce90d998887
df36257a53561a51af969a6ea6319dd2579509b9

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'
James Almer [Thu, 23 Mar 2017 21:20:29 +0000 (18:20 -0300)]
Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'

* commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9':
  build: Add VSX-OBJS to SUBDIR_VARS

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '58224dc5f3d4fea40a8d55cca87291a960c11622'
James Almer [Thu, 23 Mar 2017 21:17:45 +0000 (18:17 -0300)]
Merge commit '58224dc5f3d4fea40a8d55cca87291a960c11622'

* commit '58224dc5f3d4fea40a8d55cca87291a960c11622':
  ppc: avcodec: Drop silly "_ppc" suffixes from files in ppc subdirectories

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2'
James Almer [Thu, 23 Mar 2017 21:13:58 +0000 (18:13 -0300)]
Merge commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2'

* 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>
2 years agoMerge commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f'
James Almer [Thu, 23 Mar 2017 21:08:41 +0000 (18:08 -0300)]
Merge commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f'

* commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f':
  vaapi_h265: Include header for slice types

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'
James Almer [Thu, 23 Mar 2017 21:05:27 +0000 (18:05 -0300)]
Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'

* commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4':
  x86: Add missing colons after assembly labels

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055'
James Almer [Thu, 23 Mar 2017 21:01:47 +0000 (18:01 -0300)]
Merge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055'

* commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055':
  build: Drop arch-specific checkasm Makefiles

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81'
James Almer [Thu, 23 Mar 2017 20:48:28 +0000 (17:48 -0300)]
Merge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81'

* commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81':
  build: Drop duplicate asm recipe

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'c91d6a33f872574c95c8784277cf60ffcf6bff4f'
James Almer [Thu, 23 Mar 2017 20:38:20 +0000 (17:38 -0300)]
Merge commit 'c91d6a33f872574c95c8784277cf60ffcf6bff4f'

* commit 'c91d6a33f872574c95c8784277cf60ffcf6bff4f':
  checkasm: aarch64: Add filler args to make sure all parameters are passed on the stack

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6'
James Almer [Thu, 23 Mar 2017 20:36:53 +0000 (17:36 -0300)]
Merge commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6'

* commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6':
  checkasm: aarch64: Clobber the stack before calling functions

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'a05cc56124b4f1237f6355784de821e3290ddb44'
James Almer [Thu, 23 Mar 2017 20:35:38 +0000 (17:35 -0300)]
Merge commit 'a05cc56124b4f1237f6355784de821e3290ddb44'

* commit 'a05cc56124b4f1237f6355784de821e3290ddb44':
  checkasm: arm/aarch64: Fix the amount of space reserved for stack parameters

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'
James Almer [Thu, 23 Mar 2017 19:52:42 +0000 (16:52 -0300)]
Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'

* commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4':
  lavf: use the new bitstream filter for extracting extradata

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '89b35a139e838deeb32ec20d8d034c81014401d0'
James Almer [Thu, 23 Mar 2017 19:31:15 +0000 (16:31 -0300)]
Merge commit '89b35a139e838deeb32ec20d8d034c81014401d0'

* commit '89b35a139e838deeb32ec20d8d034c81014401d0':
  lavc: add a bitstream filter for extracting extradata from packets

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f6e2f8a9ffda2247bffba991450990d075ea68e3'
James Almer [Thu, 23 Mar 2017 18:41:09 +0000 (15:41 -0300)]
Merge commit 'f6e2f8a9ffda2247bffba991450990d075ea68e3'

* commit 'f6e2f8a9ffda2247bffba991450990d075ea68e3':
  hevcdec: move parameter set parsing into a separate header

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153'
James Almer [Thu, 23 Mar 2017 18:12:23 +0000 (15:12 -0300)]
Merge commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153'

* commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153':
  hevcdec: split ff_hevc_diag_scan* declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc: add missing hevc.h header
James Almer [Thu, 23 Mar 2017 18:07:28 +0000 (15:07 -0300)]
avcodec/hevc: add missing hevc.h header

It was lost as part of a merge in 6397815be0bee10948387fcb90ead36ec2834ef7.

2 years agoMerge commit '645c6ff4231a75a71db58c8e6d06346068d2f949'
James Almer [Thu, 23 Mar 2017 17:57:32 +0000 (14:57 -0300)]
Merge commit '645c6ff4231a75a71db58c8e6d06346068d2f949'

* commit '645c6ff4231a75a71db58c8e6d06346068d2f949':
  hevcdec: drop the prototype of a non-existing function

This commit is a noop. The prototype in question is not in our tree.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'c359d624d3efc3fd1d83210d78c4152bd329b765'
James Almer [Thu, 23 Mar 2017 17:27:48 +0000 (14:27 -0300)]
Merge commit 'c359d624d3efc3fd1d83210d78c4152bd329b765'

* commit 'c359d624d3efc3fd1d83210d78c4152bd329b765':
  hevcdec: move decoder-independent declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/bytestream: check for AV_HAVE_BIGENDIAN instead of HAVE_BIGENDIAN
James Almer [Thu, 23 Mar 2017 17:26:44 +0000 (14:26 -0300)]
avcodec/bytestream: check for AV_HAVE_BIGENDIAN instead of HAVE_BIGENDIAN

No need to include config.h for HAVE_BIGENDIAN when libavutil/avconfig.h
is already included.

2 years agoavcodec/nvenc: apply quantization factors to cqp
Timo Rothenpieler [Thu, 23 Mar 2017 16:10:25 +0000 (17:10 +0100)]
avcodec/nvenc: apply quantization factors to cqp

2 years agoavcodec/nvenc: Deprecate usage of global_quality, introducing qp
Timo Rothenpieler [Thu, 23 Mar 2017 16:01:40 +0000 (17:01 +0100)]
avcodec/nvenc: Deprecate usage of global_quality, introducing qp

2 years agoMerge commit '4abe3b049d987420eb891f74a35af2cebbf52144'
Clément Bœsch [Thu, 23 Mar 2017 15:48:41 +0000 (16:48 +0100)]
Merge commit '4abe3b049d987420eb891f74a35af2cebbf52144'

* commit '4abe3b049d987420eb891f74a35af2cebbf52144':
  hevc: rename hevc.[ch] to hevcdec.[ch]

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '6c31ba226968f12f898120dbb928dab34e03782b'
Clément Bœsch [Thu, 23 Mar 2017 15:41:16 +0000 (16:41 +0100)]
Merge commit '6c31ba226968f12f898120dbb928dab34e03782b'

* commit '6c31ba226968f12f898120dbb928dab34e03782b':
  avformat/matroska: fix MatroskaVideoFieldOrder enum values

This commit is a noop, see dc781459cc1a927a944c709c4cb400bb953a4f45

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '20b75970e43a030f959b17ff2dfd561174b6f24e'
Clément Bœsch [Thu, 23 Mar 2017 15:40:15 +0000 (16:40 +0100)]
Merge commit '20b75970e43a030f959b17ff2dfd561174b6f24e'

* commit '20b75970e43a030f959b17ff2dfd561174b6f24e':
  file protocol: handle the file: protocol string in file_check

This commit is a noop, see 77015443a84bb5dbed38eafc2ea26a2bf2641ed6

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1'
Clément Bœsch [Thu, 23 Mar 2017 15:37:58 +0000 (16:37 +0100)]
Merge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1'

* commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1':
  rtmpproto: Don't include a client version in the unencrypted C1 handshake

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'
Clément Bœsch [Thu, 23 Mar 2017 15:37:31 +0000 (16:37 +0100)]
Merge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'

* commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56':
  rtmpproto: Don't include the libavformat version as "clientid"

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830'
Clément Bœsch [Thu, 23 Mar 2017 15:36:05 +0000 (16:36 +0100)]
Merge commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830'

* commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830':
  rtmpproto: Send chunk size on the network channel

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe'
Clément Bœsch [Thu, 23 Mar 2017 15:35:17 +0000 (16:35 +0100)]
Merge commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe'

* commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe':
  rtmpproto: Lengthen the filename buffer when receiving streams

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '7395784ba72742b6daa62d35db4028e09f3fdf06'
Clément Bœsch [Thu, 23 Mar 2017 15:34:19 +0000 (16:34 +0100)]
Merge commit '7395784ba72742b6daa62d35db4028e09f3fdf06'

* commit '7395784ba72742b6daa62d35db4028e09f3fdf06':
  rtmpproto: Check the return from ff_amf_read_string

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'c9527bf3444c5332fa04931d32997308784fc862'
Clément Bœsch [Thu, 23 Mar 2017 15:31:15 +0000 (16:31 +0100)]
Merge commit 'c9527bf3444c5332fa04931d32997308784fc862'

* commit 'c9527bf3444c5332fa04931d32997308784fc862':
  Make the RELEASE file match with the most recent tag

This commit is noop.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '881477c77bb10c3c62fda111b0f1f3554968bc78'
Clément Bœsch [Thu, 23 Mar 2017 15:25:36 +0000 (16:25 +0100)]
Merge commit '881477c77bb10c3c62fda111b0f1f3554968bc78'

* commit '881477c77bb10c3c62fda111b0f1f3554968bc78':
  swscale: Add the GBRAP12 output
  Add GBRAP12 pixel format support
  swscale: Enable GBRP12 output
  swscale: x86: Add some forgotten 12-bit planar YUV cases
  swscale: Add input support for 12-bit formats

This merge is noop, these commits are recrafted cherry-picks from
FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '1e93aa69a60815d1407a6c34d8da3f83ab193ad5'
Clément Bœsch [Thu, 23 Mar 2017 15:21:43 +0000 (16:21 +0100)]
Merge commit '1e93aa69a60815d1407a6c34d8da3f83ab193ad5'

* commit '1e93aa69a60815d1407a6c34d8da3f83ab193ad5':
  Add GBRP12 pixel format support

This commit is a noop, see e9757066e11a9acb98040489c1ffc8440cd74d0e

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e7e5be8635c1cf0588d2a07e59374135de6da55a'
Clément Bœsch [Thu, 23 Mar 2017 15:08:49 +0000 (16:08 +0100)]
Merge commit 'e7e5be8635c1cf0588d2a07e59374135de6da55a'

* commit 'e7e5be8635c1cf0588d2a07e59374135de6da55a':
  APIchanges: Expand the name of recently added pixel formats

This commit is a noop, we don't have this entry.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '14e7e19a90e9b45db7adeb4d40e7f16aa7404f28'
Clément Bœsch [Thu, 23 Mar 2017 15:03:43 +0000 (16:03 +0100)]
Merge commit '14e7e19a90e9b45db7adeb4d40e7f16aa7404f28'

* commit '14e7e19a90e9b45db7adeb4d40e7f16aa7404f28':
  lavc: bsf: Document input/output codecparam alloc/init process

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'eb542106029a9b28b4f76ff7c181eb4f542da9c4'
Clément Bœsch [Thu, 23 Mar 2017 15:02:11 +0000 (16:02 +0100)]
Merge commit 'eb542106029a9b28b4f76ff7c181eb4f542da9c4'

* commit 'eb542106029a9b28b4f76ff7c181eb4f542da9c4':
  swscale: Add missing yuv444p12 swapping

This commit is a noop, these pixel formats were introduced long ago and
present in the switch case.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '112cee0241f5799edff0e4682b9e8639b046dc78'
Clément Bœsch [Thu, 23 Mar 2017 14:39:16 +0000 (15:39 +0100)]
Merge commit '112cee0241f5799edff0e4682b9e8639b046dc78'

* commit '112cee0241f5799edff0e4682b9e8639b046dc78':
  hevc: Add SSE2 and AVX IDCT

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoavcodec/videotoolboxenc: remove unused atomic header
James Almer [Wed, 22 Mar 2017 22:33:46 +0000 (19:33 -0300)]
avcodec/videotoolboxenc: remove unused atomic header

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/mediacodec: convert to stdatomic
James Almer [Wed, 22 Mar 2017 18:27:30 +0000 (15:27 -0300)]
avcodec/mediacodec: convert to stdatomic

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/h264_ps: Fix runtime error: signed integer overflow: 2147483647 + 26 cannot...
Michael Niedermayer [Tue, 21 Mar 2017 23:17:05 +0000 (00:17 +0100)]
avcodec/h264_ps: Fix runtime error: signed integer overflow: 2147483647 + 26 cannot be represented in type 'int'

Fixes: 902/clusterfuzz-testcase-4561155144024064

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/pictordec: runtime error: left shift of 15 by 28 places cannot be represented...
Michael Niedermayer [Tue, 21 Mar 2017 01:20:35 +0000 (02:20 +0100)]
avcodec/pictordec: runtime error: left shift of 15 by 28 places cannot be represented in type 'int'

Fixes: 898/clusterfuzz-testcase-6149765467209728

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/tiff: Check geotag count for being non zero
Michael Niedermayer [Tue, 21 Mar 2017 00:55:01 +0000 (01:55 +0100)]
avcodec/tiff: Check geotag count for being non zero

Fixes memleak
Fixes: 874/clusterfuzz-testcase-5252796175613952

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agohls: consistent use of user_agent
Jan Berkel [Fri, 17 Feb 2017 11:00:40 +0000 (12:00 +0100)]
hls: consistent use of user_agent

This came up while debugging a problem with mpv:
https://github.com/mpv-player/mpv/issues/4155

Signed-off-by: wm4 <nfxjfg@googlemail.com>
2 years agoMerge commit 'e3f941cb03b139b866a0ad6dc95fbe1b247d54af'
Clément Bœsch [Thu, 23 Mar 2017 11:17:39 +0000 (12:17 +0100)]
Merge commit 'e3f941cb03b139b866a0ad6dc95fbe1b247d54af'

* commit 'e3f941cb03b139b866a0ad6dc95fbe1b247d54af':
  checkasm: add a test for HEVC IDCT

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '9b2ccafb480c94fd09cfb24306d5296dc013cf5b'
Clément Bœsch [Thu, 23 Mar 2017 11:15:39 +0000 (12:15 +0100)]
Merge commit '9b2ccafb480c94fd09cfb24306d5296dc013cf5b'

* commit '9b2ccafb480c94fd09cfb24306d5296dc013cf5b':
  aarch64: Add missing sign extension in ff_h264_idct8_add_neon

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8'
Clément Bœsch [Thu, 23 Mar 2017 11:11:05 +0000 (12:11 +0100)]
Merge commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8'

* commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8':
  nvenc: Fix error log

This commit is a noop, the error message is correct in FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'da2848375a2e2121dad9f1e8cbd0ead4e3bf77d6'
Clément Bœsch [Thu, 23 Mar 2017 11:08:22 +0000 (12:08 +0100)]
Merge commit 'da2848375a2e2121dad9f1e8cbd0ead4e3bf77d6'

* commit 'da2848375a2e2121dad9f1e8cbd0ead4e3bf77d6':
  nvenc: Force high_444 profile for 444 input

This commit is a noop, see 20abda6b626c0efe1df298eab697d61ba52669c3

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'e4128c08d786eb5513578e8c6063671ba03226ab'
Clément Bœsch [Thu, 23 Mar 2017 11:03:25 +0000 (12:03 +0100)]
Merge commit 'e4128c08d786eb5513578e8c6063671ba03226ab'

* commit 'e4128c08d786eb5513578e8c6063671ba03226ab':
  Revert "hevc: x86: Refactor IDCT macro declarations"

So apparently this was technically correct be reverted due to
authorship. Reverted as well in FFmpeg for now...

See http://lists.libav.org/pipermail/libav-devel/2016-October/079560.html

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '5801f9ed245ca5ebb57b0b5183de7a24aaece133'
Clément Bœsch [Thu, 23 Mar 2017 10:58:01 +0000 (11:58 +0100)]
Merge commit '5801f9ed245ca5ebb57b0b5183de7a24aaece133'

* commit '5801f9ed245ca5ebb57b0b5183de7a24aaece133':
  h264_intrapred: x86: Update comments left behind in 95c89da36ebeeb96b7146c0d70f46c582397da7f

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '20abcaa273a6e77d0a2e1a98c643c73562c6f8f2'
Clément Bœsch [Thu, 23 Mar 2017 10:56:55 +0000 (11:56 +0100)]
Merge commit '20abcaa273a6e77d0a2e1a98c643c73562c6f8f2'

* commit '20abcaa273a6e77d0a2e1a98c643c73562c6f8f2':
  configure: #include stdint.h as part of libxavs test

This commit is a noop, see 20c4fb2e010fff7e3f8acd36ad132c0140fec5fb

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c'
Clément Bœsch [Thu, 23 Mar 2017 10:54:53 +0000 (11:54 +0100)]
Merge commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c'

* commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c':
  hevc: x86: Refactor IDCT macro declarations

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'be630b1e08ebe8f766b1798accd6b8e5e096f5aa'
Clément Bœsch [Thu, 23 Mar 2017 10:47:13 +0000 (11:47 +0100)]
Merge commit 'be630b1e08ebe8f766b1798accd6b8e5e096f5aa'

* commit 'be630b1e08ebe8f766b1798accd6b8e5e096f5aa':
  d3d11va: Use the proper decoding slice index

This commit is a noop, see 9b462a0b9df6260f59726c98d8aef8b07a1e442b

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '715f139c9bd407ef7f4d1f564ad683140ec61e6d'
Clément Bœsch [Thu, 23 Mar 2017 10:41:47 +0000 (11:41 +0100)]
Merge commit '715f139c9bd407ef7f4d1f564ad683140ec61e6d'

* commit '715f139c9bd407ef7f4d1f564ad683140ec61e6d': (23 commits)
  vp9lpf/x86: make filter_16_h work on 32-bit.
  vp9lpf/x86: make filter_48/84/88_h work on 32-bit.
  vp9lpf/x86: make filter_44_h work on 32-bit.
  vp9lpf/x86: make filter_16_v work on 32-bit.
  vp9lpf/x86: make filter_48/84_v work on 32-bit.
  vp9lpf/x86: make filter_88_v work on 32-bit.
  vp9lpf/x86: make filter_44_v work on 32-bit.
  vp9lpf/x86: save one register in SIGN_ADD/SUB.
  vp9lpf/x86: store unpacked intermediates for filter6/14 on stack.
  vp9lpf/x86: move variable assigned inside macro branch.
  vp9lpf/x86: simplify ABSSUM_CMP by inverting the comparison meaning.
  vp9lpf/x86: remove unused register from ABSSUB_CMP macro.
  vp9lpf/x86: slightly simplify 44/48/84/88 h stores.
  vp9lpf/x86: make cglobal statement more conservative in register allocation.
  vp9lpf/x86: save one register in loopfilter surface coverage.
  vp9lpf/x86: add ff_vp9_loop_filter_[vh]_44_16_{sse2,ssse3,avx}.
  vp9lpf/x86: add ff_vp9_loop_filter_h_{48,84}_16_{sse2,ssse3,avx}().
  vp9lpf/x86: add an SSE2 version of vp9_loop_filter_[vh]_88_16
  vp9lpf/x86: add ff_vp9_loop_filter_[vh]_88_16_{ssse3,avx}.
  vp9lpf/x86: add ff_vp9_loop_filter_[vh]_16_16_sse2().
  ...

All these commits are cherry-picks from FFmpeg. Maybe some slight
differences sneaked in but the Libav codebase still differs too much
with our own to make a proper diff. This merge is a noop.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9'
Clément Bœsch [Thu, 23 Mar 2017 10:40:09 +0000 (11:40 +0100)]
Merge commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9'

* commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9':
  fate: Add test for rscc palette

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266'
Clément Bœsch [Thu, 23 Mar 2017 10:33:27 +0000 (11:33 +0100)]
Merge commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266'

* commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266':
  rscc: Support palette format

See 11777eb8142117864bff0c8060f17b4089434143

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'b8d5070db6313f985562865edcfd08a01c2d7503'
Clément Bœsch [Thu, 23 Mar 2017 10:27:41 +0000 (11:27 +0100)]
Merge commit 'b8d5070db6313f985562865edcfd08a01c2d7503'

* commit 'b8d5070db6313f985562865edcfd08a01c2d7503':
  avcodec: Document AV_PKT_DATA_PALETTE side data type

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '497c087939e32b26b792515d2dbc7e22561203f7'
Clément Bœsch [Thu, 23 Mar 2017 10:27:12 +0000 (11:27 +0100)]
Merge commit '497c087939e32b26b792515d2dbc7e22561203f7'

* commit '497c087939e32b26b792515d2dbc7e22561203f7':
  avidec: Set palette alpha as fully opaque

This commit is a noop, see 64cafe340bd5ddfe704efa95cd9f21471ca12a12

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4'
Clément Bœsch [Thu, 23 Mar 2017 10:26:20 +0000 (11:26 +0100)]
Merge commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4'

* commit 'bad4aad4037f59ba0ad656164be9ab8f7a0fa2d4':
  avidec: Do not special case palette on big-endian

This commit is a noop, see 64cafe340bd5ddfe704efa95cd9f21471ca12a12

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '310c55f1799deab395319471a75c528d0fa7b30d'
Clément Bœsch [Thu, 23 Mar 2017 10:22:32 +0000 (11:22 +0100)]
Merge commit '310c55f1799deab395319471a75c528d0fa7b30d'

* commit '310c55f1799deab395319471a75c528d0fa7b30d':
  pixfmt: Document alternative names for smpte 431 and 432

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e'
Clément Bœsch [Thu, 23 Mar 2017 10:20:34 +0000 (11:20 +0100)]
Merge commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e'

* commit '5a5df90d9c05d86d9b0564b8b40b6d64a324df5e':
  vaapi_h265: Add main 10 encode support

This commit is a noop, see b9514756ba2b4f764fb86500a8172a57acb58403

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'eaaaabf6c93321cdb78bf61dc383cf515ec12e07'
Clément Bœsch [Thu, 23 Mar 2017 10:19:25 +0000 (11:19 +0100)]
Merge commit 'eaaaabf6c93321cdb78bf61dc383cf515ec12e07'

* commit 'eaaaabf6c93321cdb78bf61dc383cf515ec12e07':
  hwcontext_vaapi: Enable P010 support

This commit is a noop, see 7e0623b70ba79df6b07e71a810f495ce7e5886f8

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3'
Clément Bœsch [Thu, 23 Mar 2017 10:16:11 +0000 (11:16 +0100)]
Merge commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3'

* commit 'b8cac1e83066aa87e8402c146c81b77a11b5eec3':
  vaapi_h265: Fix buffering parameters
  vaapi_h265: Fix slice header writing
  vaapi_h264: Write bitstream restriction fields
  vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext
  vaapi_encode: Decide on GOP setup before initialising sequence parameters

This merge is a noop, see:
  30ebabca7c vaapi_h265: Fix buffering parameters
  ae0230cc3e vaapi_h265: Fix slice header writing
  6796e6ea84 vaapi_h264: Write bitstream restriction fields
  658c5afaa0 vaapi_h264: Fix CFR mode with frame_rate set in AVCodecContext
  ded1859df1 vaapi_encode: Decide on GOP setup before initialising sequence parameters

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '5cc0057f4910c8c72421b812c8f337ef6c43696c'
Clément Bœsch [Thu, 23 Mar 2017 10:12:05 +0000 (11:12 +0100)]
Merge commit '5cc0057f4910c8c72421b812c8f337ef6c43696c'

* commit '5cc0057f4910c8c72421b812c8f337ef6c43696c':
  lavu: remove the custom atomic API

This commit is a noop. The removal is postponed until all usages in
FFmpeg are dropped as well. A patchset is on discussion on the
mailing-list:
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html

Merged-by: Clément Bœsch <u@pkh.me>
2 years agolavc: vdpau: Add support for new hw_frames_ctx and hw_device_ctx API
wm4 [Sat, 4 Mar 2017 23:57:33 +0000 (23:57 +0000)]
lavc: vdpau: Add support for new hw_frames_ctx and hw_device_ctx API

This supports retrieving the device from a provided hw_frames_ctx, and
automatically creating a hw_frames_ctx if hw_device_ctx is set.

The old API is not deprecated yet. The user can still use
av_vdpau_bind_context() (with or without setting hw_frames_ctx), or use
the API before that by allocating and setting hwaccel_context manually.

Cherry-picked from Libav commit 1a7ddba5.
(Adds missing APIchanges entry to the Libav version.)

Reviewed-by: Mark Thompson <sw@jkqxz.net>
2 years agolavc: Add hwaccel_flags field to AVCodecContext
wm4 [Sat, 4 Mar 2017 23:57:32 +0000 (23:57 +0000)]
lavc: Add hwaccel_flags field to AVCodecContext

This "reuses" the flags introduced for the av_vdpau_bind_context() API
function, and makes them available to all hwaccels. This does not affect
the current vdpau API, as av_vdpau_bind_context() should obviously
override the AVCodecContext.hwaccel_flags flags for the sake of
compatibility.

Cherry-picked from Libav commit 16a163b5.

Reviewed-by: Mark Thompson <sw@jkqxz.net>
2 years agoavcodec/lossless_videodsp: use ptrdiff_t for length parameters
James Almer [Wed, 22 Mar 2017 21:27:53 +0000 (18:27 -0300)]
avcodec/lossless_videodsp: use ptrdiff_t for length parameters

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agovaapi_vp9: Mark as async-safe
Mark Thompson [Tue, 21 Mar 2017 22:31:21 +0000 (22:31 +0000)]
vaapi_vp9: Mark as async-safe

2 years agovaapi_hevc: Mark as async-safe
Mark Thompson [Tue, 21 Mar 2017 22:31:04 +0000 (22:31 +0000)]
vaapi_hevc: Mark as async-safe

2 years agovaapi: Implement device-only setup
Mark Thompson [Sat, 11 Feb 2017 15:13:12 +0000 (15:13 +0000)]
vaapi: Implement device-only setup

In this case, the user only supplies a device and the frame context
is allocated internally by lavc.

(cherry picked from commit 5dd9a4b88b287bf8c93520afda7becb1ad0d1894)

2 years agoPlace attribute_deprecated in the right position for struct declarations
Diego Biurrun [Wed, 22 Feb 2017 10:39:21 +0000 (11:39 +0100)]
Place attribute_deprecated in the right position for struct declarations

libavcodec/vaapi.h:58:1: warning: attribute 'deprecated' is ignored, place it after "struct" to apply attribute to type declaration [-Wignored-attributes]

(cherry picked from commit ed6a891c364f8b0850b557d9578b8920cc15a937)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
2 years agolavc/hevc: use atomics for wpp_err
Clément Bœsch [Wed, 22 Mar 2017 17:23:17 +0000 (18:23 +0100)]
lavc/hevc: use atomics for wpp_err

2 years agomdct15: fix left shift of a negative value
Rostislav Pehlivanov [Wed, 22 Mar 2017 17:17:04 +0000 (17:17 +0000)]
mdct15: fix left shift of a negative value

Should fix Chromium issue 704064.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agolavc/bitstream_filter: remove unused atomic.h include
Clément Bœsch [Wed, 22 Mar 2017 17:17:44 +0000 (18:17 +0100)]
lavc/bitstream_filter: remove unused atomic.h include

2 years agolavc/bitstream: remove unused atomic.h include
Clément Bœsch [Wed, 22 Mar 2017 17:16:58 +0000 (18:16 +0100)]
lavc/bitstream: remove unused atomic.h include

2 years agoMerge commit '59c70227405c214b29971e6272f3a3ff6fcce3d0'
Clément Bœsch [Wed, 22 Mar 2017 17:13:47 +0000 (18:13 +0100)]
Merge commit '59c70227405c214b29971e6272f3a3ff6fcce3d0'

* commit '59c70227405c214b29971e6272f3a3ff6fcce3d0':
  pthread_frame: use atomics for frame progress

This commit is a noop, see b6587421c7799f18038c7c802b62d034ede52f8f

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5'
Clément Bœsch [Wed, 22 Mar 2017 17:12:21 +0000 (18:12 +0100)]
Merge commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5'

* commit '64a31b2854c589e4f27cd68ebe3bcceb915704e5':
  pthread_frame: use atomics for PerThreadContext.state

This commit is a noop, see 749262693247808e2db5a2eb29a11ad3cfec211c

Merged-by: Clément Bœsch <u@pkh.me>