1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

84790 Commits

Author SHA1 Message Date
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
Michael Niedermayer
3182e19c1c 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>
2017-03-23 15:25:48 +01:00
Jan Berkel
aff80aa4ec 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>
2017-03-23 12:51:21 +01:00
Clément Bœsch
50bbb67472 Merge commit 'e3f941cb03b139b866a0ad6dc95fbe1b247d54af'
* commit 'e3f941cb03b139b866a0ad6dc95fbe1b247d54af':
  checkasm: add a test for HEVC IDCT

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 12:17:39 +01:00
Clément Bœsch
739d8c83f2 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>
2017-03-23 12:15:39 +01:00
Clément Bœsch
1b2a7f42c0 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>
2017-03-23 12:11:26 +01:00
Clément Bœsch
464790f109 Merge commit 'da2848375a2e2121dad9f1e8cbd0ead4e3bf77d6'
* commit 'da2848375a2e2121dad9f1e8cbd0ead4e3bf77d6':
  nvenc: Force high_444 profile for 444 input

This commit is a noop, see 20abda6b62

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 12:08:22 +01:00
Clément Bœsch
733b13ad66 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>
2017-03-23 12:03:25 +01:00
Clément Bœsch
4bb4fa28e3 Merge commit '5801f9ed245ca5ebb57b0b5183de7a24aaece133'
* commit '5801f9ed245ca5ebb57b0b5183de7a24aaece133':
  h264_intrapred: x86: Update comments left behind in 95c89da36e

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:58:01 +01:00
Clément Bœsch
fb477193cd Merge commit '20abcaa273a6e77d0a2e1a98c643c73562c6f8f2'
* commit '20abcaa273a6e77d0a2e1a98c643c73562c6f8f2':
  configure: #include stdint.h as part of libxavs test

This commit is a noop, see 20c4fb2e01

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:56:55 +01:00
Clément Bœsch
9954d5b44e Merge commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c'
* commit 'd9dccc03890a976dba59d66ed3b5aceeaa33d14c':
  hevc: x86: Refactor IDCT macro declarations

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:54:53 +01:00
Clément Bœsch
3e40c9560a Merge commit 'be630b1e08ebe8f766b1798accd6b8e5e096f5aa'
* commit 'be630b1e08ebe8f766b1798accd6b8e5e096f5aa':
  d3d11va: Use the proper decoding slice index

This commit is a noop, see 9b462a0b9d

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:47:13 +01:00
Clément Bœsch
9a23b149c7 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>
2017-03-23 11:43:48 +01:00
Clément Bœsch
dffa4ec1ed Merge commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9'
* commit 'dc3fe45fca9c10c4af6bfcf48eb7b81968892ef9':
  fate: Add test for rscc palette

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:40:09 +01:00
Clément Bœsch
5f044d2372 Merge commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266'
* commit 'c19830aa2c19f9713b612f7e2fdb437df91ba266':
  rscc: Support palette format

See 11777eb814

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:33:27 +01:00
Clément Bœsch
7b3a3e6276 Merge commit 'b8d5070db6313f985562865edcfd08a01c2d7503'
* commit 'b8d5070db6313f985562865edcfd08a01c2d7503':
  avcodec: Document AV_PKT_DATA_PALETTE side data type

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-23 11:27:41 +01:00