Commit Graph

84602 Commits

Author SHA1 Message Date
James Almer
dc39ccdc3b Merge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'
* commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f':
  hevc: move the SliceType enum to hevc.h

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 20:02:11 -03:00
James Almer
0f4abbd4ee doc/libav-merge: add a line about the extract_extradata commits 2017-03-23 19:49:09 -03:00
James Almer
950c3fa520 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 40fa9d416a

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 19:41:50 -03:00
James Almer
40fa9d416a Revert "Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'"
This reverts commit 1c193ac1f9, reversing
changes made to 7ebc9f8df4.

Several FATE tests started failing after this merge, so it's reverted
until it can be properly fixed.
2017-03-23 19:34:00 -03:00
James Almer
380448194f Merge commit '788544ff0ed6fe67fda80ad6d3a0796ace035584'
* commit '788544ff0ed6fe67fda80ad6d3a0796ace035584':
  audiodsp: x86: Remove pointless header file

This commit is a noop, see 6ec3dc97fc

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:45:56 -03:00
James Almer
d07f2dacb9 Merge commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e'
* commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e':
  configure: Print warnings after all other output

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:43:39 -03:00
James Almer
bac44a5020 Merge commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9'
* commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9':
  x86: videodsp: Add parentheses to expression to work around warning

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:35:49 -03:00
James Almer
acf125f333 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>
2017-03-23 18:33:50 -03:00
James Almer
0d34473d8e Merge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'
* commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b':
  checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:31:36 -03:00
James Almer
c97e986e90 Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'
* commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8':
  emms: Give apriv_emms_yasm() a more general name

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:28:56 -03:00
James Almer
0dcfa02fd2 Merge commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d'
* commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d':
  swscale: Properly load alpha for planar rgb

This commit is a noop, see
4170a44bbc
df36257a53

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:27:01 -03:00
James Almer
78c52e2721 Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'
* commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9':
  build: Add VSX-OBJS to SUBDIR_VARS

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:20:29 -03:00
James Almer
09a80419b7 Merge commit '58224dc5f3d4fea40a8d55cca87291a960c11622'
* commit '58224dc5f3d4fea40a8d55cca87291a960c11622':
  ppc: avcodec: Drop silly "_ppc" suffixes from files in ppc subdirectories

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:17:45 -03:00
James Almer
530066166e Merge commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2'
* commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2':
  vaapi_encode: Write sequence header as extradata

This commit is a noop. It has already been cherry-picked in
51020adcec

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:15:42 -03:00
James Almer
c43fd1f279 Merge commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f'
* commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f':
  vaapi_h265: Include header for slice types

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:08:41 -03:00
James Almer
29db87af52 Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'
* commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4':
  x86: Add missing colons after assembly labels

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:05:27 -03:00
James Almer
f23078904f Merge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055'
* commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055':
  build: Drop arch-specific checkasm Makefiles

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 18:01:47 -03:00
James Almer
3ddae9eee9 Merge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81'
* commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81':
  build: Drop duplicate asm recipe

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 17:57:35 -03:00
James Almer
67b639b496 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>
2017-03-23 17:38:20 -03:00
James Almer
a2d34cc51b Merge commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6'
* commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6':
  checkasm: aarch64: Clobber the stack before calling functions

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 17:36:53 -03:00
James Almer
cab4c7fa19 Merge commit 'a05cc56124b4f1237f6355784de821e3290ddb44'
* commit 'a05cc56124b4f1237f6355784de821e3290ddb44':
  checkasm: arm/aarch64: Fix the amount of space reserved for stack parameters

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 17:35:38 -03:00
James Almer
1c193ac1f9 Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'
* commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4':
  lavf: use the new bitstream filter for extracting extradata

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 16:52:42 -03:00
James Almer
7ebc9f8df4 Merge commit '89b35a139e838deeb32ec20d8d034c81014401d0'
* commit '89b35a139e838deeb32ec20d8d034c81014401d0':
  lavc: add a bitstream filter for extracting extradata from packets

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 16:31:15 -03:00
James Almer
4a5810b659 Merge commit 'f6e2f8a9ffda2247bffba991450990d075ea68e3'
* commit 'f6e2f8a9ffda2247bffba991450990d075ea68e3':
  hevcdec: move parameter set parsing into a separate header

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 15:53:00 -03:00
James Almer
b29c8c995f Merge commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153'
* commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153':
  hevcdec: split ff_hevc_diag_scan* declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 15:14:06 -03:00
James Almer
5c6efaffd0 avcodec/hevc: add missing hevc.h header
It was lost as part of a merge in 6397815be0.
2017-03-23 15:07:28 -03:00
James Almer
e7a6200dcb 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>
2017-03-23 14:59:09 -03:00
James Almer
6397815be0 Merge commit 'c359d624d3efc3fd1d83210d78c4152bd329b765'
* commit 'c359d624d3efc3fd1d83210d78c4152bd329b765':
  hevcdec: move decoder-independent declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
2017-03-23 14:27:48 -03:00
James Almer
a1a80a6c9c 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.
2017-03-23 14:26:44 -03:00
Timo Rothenpieler
d84c2298e2 avcodec/nvenc: apply quantization factors to cqp 2017-03-23 17:10:52 +01:00
Timo Rothenpieler
7fb2a7afa1 avcodec/nvenc: Deprecate usage of global_quality, introducing qp 2017-03-23 17:10:52 +01:00
Clément Bœsch
038e6aef7a Merge commit '4abe3b049d987420eb891f74a35af2cebbf52144'
* commit '4abe3b049d987420eb891f74a35af2cebbf52144':
  hevc: rename hevc.[ch] to hevcdec.[ch]

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 16:48:41 +01:00
Clément Bœsch
590fb5291a Merge commit '6c31ba226968f12f898120dbb928dab34e03782b'
* commit '6c31ba226968f12f898120dbb928dab34e03782b':
  avformat/matroska: fix MatroskaVideoFieldOrder enum values

This commit is a noop, see dc781459cc

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 16:41:16 +01:00
Clément Bœsch
962e15d0f5 Merge commit '20b75970e43a030f959b17ff2dfd561174b6f24e'
* commit '20b75970e43a030f959b17ff2dfd561174b6f24e':
  file protocol: handle the file: protocol string in file_check

This commit is a noop, see 77015443a8

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 16:40:15 +01:00
Clément Bœsch
8892739a16 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>
2017-03-23 16:37:58 +01:00
Clément Bœsch
ddcd396075 Merge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'
* commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56':
  rtmpproto: Don't include the libavformat version as "clientid"

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 16:37:31 +01:00
Clément Bœsch
d1c341f77b Merge commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830'
* commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830':
  rtmpproto: Send chunk size on the network channel

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 16:36:05 +01:00
Clément Bœsch
a106b7e8b9 Merge commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe'
* commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe':
  rtmpproto: Lengthen the filename buffer when receiving streams

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 16:35:17 +01:00
Clément Bœsch
36fcbc0076 Merge commit '7395784ba72742b6daa62d35db4028e09f3fdf06'
* commit '7395784ba72742b6daa62d35db4028e09f3fdf06':
  rtmpproto: Check the return from ff_amf_read_string

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 16:34:19 +01:00
Clément Bœsch
e7329c0fd5 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>
2017-03-23 16:31:15 +01:00
Clément Bœsch
6d541424da 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>
2017-03-23 16:26:45 +01:00
Clément Bœsch
fbd352e077 Merge commit '1e93aa69a60815d1407a6c34d8da3f83ab193ad5'
* commit '1e93aa69a60815d1407a6c34d8da3f83ab193ad5':
  Add GBRP12 pixel format support

This commit is a noop, see e9757066e1

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 16:21:43 +01:00
Clément Bœsch
295450e7f4 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>
2017-03-23 16:08:49 +01:00
Clément Bœsch
cc012c46e8 Merge commit '14e7e19a90e9b45db7adeb4d40e7f16aa7404f28'
* commit '14e7e19a90e9b45db7adeb4d40e7f16aa7404f28':
  lavc: bsf: Document input/output codecparam alloc/init process

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 16:03:43 +01:00
Clément Bœsch
4c45c866cf 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>
2017-03-23 16:02:28 +01:00
Clément Bœsch
947230837c Merge commit '112cee0241f5799edff0e4682b9e8639b046dc78'
* commit '112cee0241f5799edff0e4682b9e8639b046dc78':
  hevc: Add SSE2 and AVX IDCT

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 15:58:46 +01:00
James Almer
05510ec067 avcodec/videotoolboxenc: remove unused atomic header
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-23 11:51:00 -03:00
James Almer
005da88c1e avcodec/mediacodec: convert to stdatomic
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-23 11:44:58 -03:00
Michael Niedermayer
4f727fbc73 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>
2017-03-23 15:25:48 +01:00
Michael Niedermayer
0f34c0789f 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>
2017-03-23 15:25:48 +01:00