ffmpeg.git
3 years agox86/float_dsp: add ff_vector_dmac_scalar_{sse2,avx,fma3}
James Almer [Mon, 10 Apr 2017 15:17:03 +0000 (12:17 -0300)]
x86/float_dsp: add ff_vector_dmac_scalar_{sse2,avx,fma3}

3 years agoavutil/float_dsp: add test for vector_dmac_scalar
James Almer [Mon, 10 Apr 2017 15:12:55 +0000 (12:12 -0300)]
avutil/float_dsp: add test for vector_dmac_scalar

3 years agoavfilter/vf_blend: add GBRAP16
Paul B Mahol [Mon, 10 Apr 2017 14:52:27 +0000 (16:52 +0200)]
avfilter/vf_blend: add GBRAP16

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoRevert "avcodec/svq1: zero initialize entries array"
Clément Bœsch [Mon, 10 Apr 2017 11:46:52 +0000 (13:46 +0200)]
Revert "avcodec/svq1: zero initialize entries array"

This reverts commit aed84ee4d1b0c9e315a84b1ee0918fa49ee9cc09.

It is a false positive from Valgrind with recent GCC and
-funswitch-loops (present in -O3).

3 years agoavformat/movenc: auto insert vp9_superframe bsf when needed
James Almer [Mon, 10 Apr 2017 04:32:18 +0000 (01:32 -0300)]
avformat/movenc: auto insert vp9_superframe bsf when needed

Experimental VP9 support was added to the muxer recently.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/pixlet: Reorder rlen check
Michael Niedermayer [Sat, 8 Apr 2017 01:34:45 +0000 (03:34 +0200)]
avcodec/pixlet: Reorder rlen check

This changes nothing but is nicer looking as this checks rlen

Maybe this helps coverity remove CID1397743

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/mjpegenc_huffman: Assert length in ff_mjpegenc_huffman_compute_bits()
Michael Niedermayer [Sat, 8 Apr 2017 01:34:44 +0000 (03:34 +0200)]
avcodec/mjpegenc_huffman: Assert length in ff_mjpegenc_huffman_compute_bits()

This should help coverity see that the issues this leads to cannot occur

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/af_amix: add double sample format support
Paul B Mahol [Sun, 9 Apr 2017 20:10:14 +0000 (22:10 +0200)]
avfilter/af_amix: add double sample format support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavutil/float_dsp: add vector_dmac_scalar()
Paul B Mahol [Mon, 10 Apr 2017 09:31:11 +0000 (11:31 +0200)]
avutil/float_dsp: add vector_dmac_scalar()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/vf_paletteuse: silence warning about misaligned indentation
Paul B Mahol [Mon, 10 Apr 2017 09:25:44 +0000 (11:25 +0200)]
avfilter/vf_paletteuse: silence warning about misaligned indentation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/vf_dctdnoiz: add GBRP support
Paul B Mahol [Sun, 9 Apr 2017 15:38:41 +0000 (17:38 +0200)]
avfilter/vf_dctdnoiz: add GBRP support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agompegvideo_enc: disable optimized huffman coding with AMV or slice threads
Rostislav Pehlivanov [Tue, 4 Apr 2017 09:58:37 +0000 (10:58 +0100)]
mpegvideo_enc: disable optimized huffman coding with AMV or slice threads

Doesn't work yet with slice threading and won't work with AMV.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoRevert "mjpegenc: disable huffman coding with AMV"
Michael Niedermayer [Sun, 9 Apr 2017 19:51:33 +0000 (21:51 +0200)]
Revert "mjpegenc: disable huffman coding with AMV"

This was the wrong patch

This reverts commit 7f9b492d544ccef36f1d5d97a76d22502623d3c8.

3 years agoMerge commit '3d6135eacf3b6a82c3024620c6a28169960464a7'
James Almer [Sun, 9 Apr 2017 17:51:31 +0000 (14:51 -0300)]
Merge commit '3d6135eacf3b6a82c3024620c6a28169960464a7'

* commit '3d6135eacf3b6a82c3024620c6a28169960464a7':
  configure: Simplify OMX check

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '601f8dde13ccd0e1993b7840a0304fa2cfe53432'
James Almer [Sun, 9 Apr 2017 17:49:09 +0000 (14:49 -0300)]
Merge commit '601f8dde13ccd0e1993b7840a0304fa2cfe53432'

* commit '601f8dde13ccd0e1993b7840a0304fa2cfe53432':
  configure: Move COMPONENT_LIST to the bottom of CONFIG_LIST

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '29d2e03ed96d9f7b8cb2cc87dca0a63c2a6eff70'
James Almer [Sun, 9 Apr 2017 17:41:43 +0000 (14:41 -0300)]
Merge commit '29d2e03ed96d9f7b8cb2cc87dca0a63c2a6eff70'

* commit '29d2e03ed96d9f7b8cb2cc87dca0a63c2a6eff70':
  configure: Simplify and fix avfoundation indev handling

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '5d45fe7da972da528915fbdfe3dbf22eb2effd01'
James Almer [Sun, 9 Apr 2017 17:16:44 +0000 (14:16 -0300)]
Merge commit '5d45fe7da972da528915fbdfe3dbf22eb2effd01'

* commit '5d45fe7da972da528915fbdfe3dbf22eb2effd01':
  build: Add EXTRALIBS to TOOLS linker command

This commit is a noop. We're already adding EXTRALIBS to the linker
command on a case by case basis.

Merged-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/hevcdec: remove duplicate extradata parsing function
James Almer [Sun, 2 Apr 2017 18:41:10 +0000 (15:41 -0300)]
avcodec/hevcdec: remove duplicate extradata parsing function

Use ff_hevc_decode_extradata() instead, which correctly only tries
to decode parameter set NAL units and not any other NAL that may be
present in extradata.

Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/hevc_parse: split build dependencies
James Almer [Sun, 2 Apr 2017 18:40:01 +0000 (15:40 -0300)]
avcodec/hevc_parse: split build dependencies

Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/hevc_parse: allow setting apply_defdispwin when decoding SPS NAL units
James Almer [Sun, 2 Apr 2017 03:16:02 +0000 (00:16 -0300)]
avcodec/hevc_parse: allow setting apply_defdispwin when decoding SPS NAL units

Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/hevc_parse: check for parameter set decoding failure
James Almer [Sun, 2 Apr 2017 03:01:20 +0000 (00:01 -0300)]
avcodec/hevc_parse: check for parameter set decoding failure

Reviewed-by: nevcairiel
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/svq1: zero initialize entries array
James Almer [Sun, 9 Apr 2017 16:38:41 +0000 (13:38 -0300)]
avcodec/svq1: zero initialize entries array

Fixes valgrind warnings about "Use of uninitialised value of size 8"

Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '2a096440768b1086bb437939f827b8b7a5716bf7'
James Almer [Sun, 9 Apr 2017 16:11:08 +0000 (13:11 -0300)]
Merge commit '2a096440768b1086bb437939f827b8b7a5716bf7'

* commit '2a096440768b1086bb437939f827b8b7a5716bf7':
  configure: Separate package name and version requirements in helper functions

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit 'ffb9025f39b274abfc4ad2b264205a44cc0238a4'
James Almer [Sun, 9 Apr 2017 15:43:55 +0000 (12:43 -0300)]
Merge commit 'ffb9025f39b274abfc4ad2b264205a44cc0238a4'

* commit 'ffb9025f39b274abfc4ad2b264205a44cc0238a4':
  configure: Simplify MMAL check

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '660470cd62c59f25cc52c731af6230e7bc1aba62'
James Almer [Sun, 9 Apr 2017 15:41:21 +0000 (12:41 -0300)]
Merge commit '660470cd62c59f25cc52c731af6230e7bc1aba62'

* commit '660470cd62c59f25cc52c731af6230e7bc1aba62':
  build: Add missing audio_frame_queue dependency for libwavpack encoder

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit 'e1dc5358af0dadef548114ec9cabba766b7c6260'
James Almer [Sun, 9 Apr 2017 15:03:30 +0000 (12:03 -0300)]
Merge commit 'e1dc5358af0dadef548114ec9cabba766b7c6260'

* commit 'e1dc5358af0dadef548114ec9cabba766b7c6260':
  build: Create a component for MPEG audio header decoding

Merged-by: James Almer <jamrial@gmail.com>
3 years agoavfilter/vf_midequalizer: add gray10 and gray12 support
Paul B Mahol [Sun, 9 Apr 2017 14:28:25 +0000 (16:28 +0200)]
avfilter/vf_midequalizer: add gray10 and gray12 support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoMerge commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd'
Clément Bœsch [Sun, 9 Apr 2017 13:10:30 +0000 (15:10 +0200)]
Merge commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd'

* commit '0fdc9f81a00f0f32eb93c324bad65d8014deb4dd':
  build: Add missing hevc_ps dependency for QSV HEVC encoder

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '6c916192f3d7441f5896f6c0fe151874fcd91fe4'
Clément Bœsch [Sun, 9 Apr 2017 13:07:39 +0000 (15:07 +0200)]
Merge commit '6c916192f3d7441f5896f6c0fe151874fcd91fe4'

* commit '6c916192f3d7441f5896f6c0fe151874fcd91fe4':
  mimic: Convert to the new bitstream reader
  metasound: Convert to the new bitstream reader
  lagarith: Convert to the new bitstream reader
  indeo: Convert to the new bitstream reader
  imc: Convert to the new bitstream reader
  webp: Convert to the new bitstream reader

This merge is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '6ef3360a38efe027cb6ebf9785870048ca7eb38b'
Clément Bœsch [Sun, 9 Apr 2017 13:05:31 +0000 (15:05 +0200)]
Merge commit '6ef3360a38efe027cb6ebf9785870048ca7eb38b'

* commit '6ef3360a38efe027cb6ebf9785870048ca7eb38b':
  configure: Add misssing qpeldsp dependency to mss2 decoder

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '14bba44fb23c63bf82b2c15f5c754b2fed7dbea9'
Clément Bœsch [Sun, 9 Apr 2017 13:00:28 +0000 (15:00 +0200)]
Merge commit '14bba44fb23c63bf82b2c15f5c754b2fed7dbea9'

* commit '14bba44fb23c63bf82b2c15f5c754b2fed7dbea9':
  build: Drop support for configuring library name suffixes

This commit is a noop. The feature is useful. Until recently I was one
of these no known users.

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '1ea77aae927c7310034b1f75d4f1c2676fe641f2'
Clément Bœsch [Sun, 9 Apr 2017 12:57:13 +0000 (14:57 +0200)]
Merge commit '1ea77aae927c7310034b1f75d4f1c2676fe641f2'

* commit '1ea77aae927c7310034b1f75d4f1c2676fe641f2':
  configure: Drop bogus xcb_event variables

This commit is a noop, see 50138ea4f7b3df618b905f9540174387cded79c6

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '3794062ab1a13442b06f6d76c54dce51ffa54697'
Clément Bœsch [Sun, 9 Apr 2017 12:52:00 +0000 (14:52 +0200)]
Merge commit '3794062ab1a13442b06f6d76c54dce51ffa54697'

* commit '3794062ab1a13442b06f6d76c54dce51ffa54697':
  Remove Plan 9 support

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '4a1ef543983b7480e2822f6ac281ba361d1f893d'
Clément Bœsch [Sun, 9 Apr 2017 12:22:43 +0000 (14:22 +0200)]
Merge commit '4a1ef543983b7480e2822f6ac281ba361d1f893d'

* commit '4a1ef543983b7480e2822f6ac281ba361d1f893d':
  build: Drop support for old versions of libdc1394

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoavcodec/hqx: add support for frame threads
Paul B Mahol [Sat, 8 Apr 2017 10:11:39 +0000 (12:11 +0200)]
avcodec/hqx: add support for frame threads

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavcodec/cllc: add support for frame threads
Paul B Mahol [Sat, 8 Apr 2017 10:30:05 +0000 (12:30 +0200)]
avcodec/cllc: add support for frame threads

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agoavfilter/avf_showcqt: add attack option
Muhammad Faiz [Sat, 8 Apr 2017 02:55:06 +0000 (09:55 +0700)]
avfilter/avf_showcqt: add attack option

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
3 years agolibavfilter/af_amix.c Increase sources from 32 to 1024
Warblefly [Fri, 7 Apr 2017 18:35:56 +0000 (19:35 +0100)]
libavfilter/af_amix.c Increase sources from 32 to 1024

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/examples/decode_video: Fix format string vulnerability
Michael Niedermayer [Fri, 7 Apr 2017 21:05:57 +0000 (23:05 +0200)]
doc/examples/decode_video: Fix format string vulnerability

Fixes: CID1404843

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/dcadsp: Fix runtime error: signed integer overflow
Michael Niedermayer [Fri, 7 Apr 2017 20:27:50 +0000 (22:27 +0200)]
avcodec/dcadsp: Fix runtime error: signed integer overflow

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agomjpegenc: enable optimal huffman coding by default
Rostislav Pehlivanov [Mon, 3 Apr 2017 21:31:27 +0000 (22:31 +0100)]
mjpegenc: enable optimal huffman coding by default

As it gives excellent encoding gains at an insignificant speed increase
and passes fate without problems, it should now be safe to enable by
default.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agomjpegenc: disable huffman coding with AMV
Rostislav Pehlivanov [Mon, 3 Apr 2017 20:13:29 +0000 (21:13 +0100)]
mjpegenc: disable huffman coding with AMV

Isn't supported.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agomjpegenc_common: check for codec ID before using avctx->priv_data
Rostislav Pehlivanov [Mon, 3 Apr 2017 20:13:28 +0000 (21:13 +0100)]
mjpegenc_common: check for codec ID before using avctx->priv_data

When coding lossless jpeg the priv context will be pointing to LJpegEncContext
rather than MpegEncContext, which the function expects.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoavformat/matroskaenc: don't try to update flac extradata if live streaming
James Almer [Sat, 8 Apr 2017 18:44:53 +0000 (15:44 -0300)]
avformat/matroskaenc: don't try to update flac extradata if live streaming

3 years agoMerge commit '2575b1917b2703fae41a4b4901ad85c888374dfd'
Clément Bœsch [Sat, 8 Apr 2017 13:09:57 +0000 (15:09 +0200)]
Merge commit '2575b1917b2703fae41a4b4901ad85c888374dfd'

* commit '2575b1917b2703fae41a4b4901ad85c888374dfd':
  build: Add separate flags for checkheaders targets

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '984e50e74ba71301720652e56232161a994bd0b5'
Clément Bœsch [Sat, 8 Apr 2017 13:00:25 +0000 (15:00 +0200)]
Merge commit '984e50e74ba71301720652e56232161a994bd0b5'

* commit '984e50e74ba71301720652e56232161a994bd0b5':
  build: Add -Wpedantic and -Wextra to extra warning flags

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '33a2b73b98374de4781ae0497cf74b2ce07a9615'
Clément Bœsch [Sat, 8 Apr 2017 12:58:06 +0000 (14:58 +0200)]
Merge commit '33a2b73b98374de4781ae0497cf74b2ce07a9615'

* commit '33a2b73b98374de4781ae0497cf74b2ce07a9615':
  mpeg4audio: correctly propagate meaningful error values

This commit is a noop, see 50b14539158bd6d179afebb795b38be108359c4a

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'd82d5379caca21005d8906829b35361c4a65408e'
Clément Bœsch [Sat, 8 Apr 2017 12:52:30 +0000 (14:52 +0200)]
Merge commit 'd82d5379caca21005d8906829b35361c4a65408e'

* commit 'd82d5379caca21005d8906829b35361c4a65408e':
  mmaldec: initialize refcount using atomic_init()

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '518a22471e40604a158180a0660aabeeec65e07f'
Clément Bœsch [Sat, 8 Apr 2017 12:51:56 +0000 (14:51 +0200)]
Merge commit '518a22471e40604a158180a0660aabeeec65e07f'

* commit '518a22471e40604a158180a0660aabeeec65e07f':
  configure: Be more helpful when requiring options set

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'a91f1023bc06091ef84dce0f1e12b72d7f3ba3ca'
Clément Bœsch [Sat, 8 Apr 2017 12:51:27 +0000 (14:51 +0200)]
Merge commit 'a91f1023bc06091ef84dce0f1e12b72d7f3ba3ca'

* commit 'a91f1023bc06091ef84dce0f1e12b72d7f3ba3ca':
  examples: fix a typo in an error message

This commit is a noop, see 3aa1ff30f3f44a2ee980556a9bd6c0bc7d9087ac

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '706af9227b58657c73e3a4df3689da734f010500'
Clément Bœsch [Sat, 8 Apr 2017 12:50:12 +0000 (14:50 +0200)]
Merge commit '706af9227b58657c73e3a4df3689da734f010500'

* commit '706af9227b58657c73e3a4df3689da734f010500':
  lavu: Document the color properties enumeration values origin

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '5168026a05258537f1c48ca95c1776b1554997f4'
Clément Bœsch [Sat, 8 Apr 2017 12:46:05 +0000 (14:46 +0200)]
Merge commit '5168026a05258537f1c48ca95c1776b1554997f4'

* commit '5168026a05258537f1c48ca95c1776b1554997f4':
  options_table: Do not rely on enum size as option bound

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'ff9db5cfd14558df9cfcc54d6c062bc34bf1f341'
Clément Bœsch [Sat, 8 Apr 2017 12:41:10 +0000 (14:41 +0200)]
Merge commit 'ff9db5cfd14558df9cfcc54d6c062bc34bf1f341'

* commit 'ff9db5cfd14558df9cfcc54d6c062bc34bf1f341':
  lavc: Use a stricter check for the color properties values

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '0a35f128f3c6e0ae9a0a2236c557602c108da269'
Clément Bœsch [Sat, 8 Apr 2017 12:30:13 +0000 (14:30 +0200)]
Merge commit '0a35f128f3c6e0ae9a0a2236c557602c108da269'

* commit '0a35f128f3c6e0ae9a0a2236c557602c108da269':
  cabac: x86: Give optimizations header a more meaningful name

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'cad42fadcd2c2ae1b3676bb398844a1f521a2d7b'
Clément Bœsch [Sat, 8 Apr 2017 12:29:06 +0000 (14:29 +0200)]
Merge commit 'cad42fadcd2c2ae1b3676bb398844a1f521a2d7b'

* commit 'cad42fadcd2c2ae1b3676bb398844a1f521a2d7b':
  aarch64: vp9itxfm: Skip empty slices in the first pass of idct_idct 16x16 and 32x32

This commit is a noop, see 8b11a89c06b94632d545f67ca508bd9c05c435ac

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '9c8bc74c2b40537b0997f646c87c008042d788c2'
Clément Bœsch [Sat, 8 Apr 2017 12:28:25 +0000 (14:28 +0200)]
Merge commit '9c8bc74c2b40537b0997f646c87c008042d788c2'

* commit '9c8bc74c2b40537b0997f646c87c008042d788c2':
  arm: vp9itxfm: Skip empty slices in the first pass of idct_idct 16x16 and 32x32

This commit is a noop, see 388f6e6715ff6f84efc858f69530867a235fe909

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '3c87039a404c5659ae9bf7454a04e186532eb40b'
Clément Bœsch [Sat, 8 Apr 2017 12:27:45 +0000 (14:27 +0200)]
Merge commit '3c87039a404c5659ae9bf7454a04e186532eb40b'

* commit '3c87039a404c5659ae9bf7454a04e186532eb40b':
  arm: vp9itxfm: Only reload the idct coeffs for the iadst_idct combination

This commit is a noop, see ecd343aa1ffbbfddac937b708d111c88159ee5f9

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'c4c5f5386c83bb8d66f8d67cd8533c8697f06d04'
Clément Bœsch [Sat, 8 Apr 2017 12:24:40 +0000 (14:24 +0200)]
Merge commit 'c4c5f5386c83bb8d66f8d67cd8533c8697f06d04'

* commit 'c4c5f5386c83bb8d66f8d67cd8533c8697f06d04':
  vp9dsp: add DC only versions for idct/idct.

This commit is a noop, see 64821f5a7cc85f8d7cfc69b5caaa8d766faedc2e

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'e4382a4ab48138d43a19ea0da96f536a5e49b50c'
Clément Bœsch [Sat, 8 Apr 2017 12:20:56 +0000 (14:20 +0200)]
Merge commit 'e4382a4ab48138d43a19ea0da96f536a5e49b50c'

* commit 'e4382a4ab48138d43a19ea0da96f536a5e49b50c':
  hevc: Eliminate pointless variable indirection

This commit is a noop, the code is different in FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '5c89022542ce8521d89ef58858342a7bc1c3cd0d'
Clément Bœsch [Sat, 8 Apr 2017 12:18:03 +0000 (14:18 +0200)]
Merge commit '5c89022542ce8521d89ef58858342a7bc1c3cd0d'

* commit '5c89022542ce8521d89ef58858342a7bc1c3cd0d':
  hevc: Drop pointless av_unused attribute

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '0983f9117f31521643162cb85380672495a9de1b'
Clément Bœsch [Sat, 8 Apr 2017 12:16:06 +0000 (14:16 +0200)]
Merge commit '0983f9117f31521643162cb85380672495a9de1b'

* commit '0983f9117f31521643162cb85380672495a9de1b':
  metasound: Drop unused tables

This commit is mostly a noop, see
276a8666d2d990335314752f8f8bdfdaac69e410
e8319f602e94af9b8454ed68d8323908ceaf944d

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'c21d78a903da378af48c9e5f971fe989592ddb65'
Clément Bœsch [Sat, 8 Apr 2017 12:13:43 +0000 (14:13 +0200)]
Merge commit 'c21d78a903da378af48c9e5f971fe989592ddb65'

* commit 'c21d78a903da378af48c9e5f971fe989592ddb65':
  configure: Integrate X11 checks into vaapi/vdpau checks

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '8b56dbe7435d8cfe3964f447fc45fe98db5d9042'
Clément Bœsch [Sat, 8 Apr 2017 12:11:21 +0000 (14:11 +0200)]
Merge commit '8b56dbe7435d8cfe3964f447fc45fe98db5d9042'

* commit '8b56dbe7435d8cfe3964f447fc45fe98db5d9042':
  configure: Do not add newlines in filter()/filter_out() functions

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '9254344e11f9b016088ec6250724f74377f5d7a0'
Clément Bœsch [Sat, 8 Apr 2017 12:06:48 +0000 (14:06 +0200)]
Merge commit '9254344e11f9b016088ec6250724f74377f5d7a0'

* commit '9254344e11f9b016088ec6250724f74377f5d7a0':
  configure: Move hardware-accelerated codec deps out of hwaccel section

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit 'd4f2a681cb6d4e913f1c879ad376313255d6cf4c'
Clément Bœsch [Sat, 8 Apr 2017 11:51:57 +0000 (13:51 +0200)]
Merge commit 'd4f2a681cb6d4e913f1c879ad376313255d6cf4c'

* commit 'd4f2a681cb6d4e913f1c879ad376313255d6cf4c':
  configure: MMAL-related decoders should depend on, not select, mmal

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoffmpeg: use av_stream_new_side_data() in init_output_stream
James Almer [Sat, 8 Apr 2017 04:12:57 +0000 (01:12 -0300)]
ffmpeg: use av_stream_new_side_data() in init_output_stream

3 years agoopusenc: switch between intra/inter mode for coarse energy
Rostislav Pehlivanov [Fri, 7 Apr 2017 23:53:31 +0000 (00:53 +0100)]
opusenc: switch between intra/inter mode for coarse energy

Saves around 5kbps.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoopusenc: do not signal digital silence
Rostislav Pehlivanov [Fri, 7 Apr 2017 23:48:28 +0000 (00:48 +0100)]
opusenc: do not signal digital silence

Apparently its only use is to enable comfort noise/error recovery.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoopusenc: minor style changes
Rostislav Pehlivanov [Fri, 7 Apr 2017 23:29:03 +0000 (00:29 +0100)]
opusenc: minor style changes

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoopusenc: remove unused header entries and simplify normalization
Rostislav Pehlivanov [Mon, 3 Apr 2017 12:13:14 +0000 (13:13 +0100)]
opusenc: remove unused header entries and simplify normalization

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoopus_rc: add macros for checkpoint rollback
Rostislav Pehlivanov [Sun, 2 Apr 2017 19:55:30 +0000 (20:55 +0100)]
opus_rc: add macros for checkpoint rollback

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoopus_celt: fix some style issues
Rostislav Pehlivanov [Sun, 2 Apr 2017 19:55:11 +0000 (20:55 +0100)]
opus_celt: fix some style issues

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agomdct15: use existing complex multiplication macros
Rostislav Pehlivanov [Sat, 1 Apr 2017 18:41:52 +0000 (19:41 +0100)]
mdct15: use existing complex multiplication macros

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agovf_pad: center image on padded area if negative x/y
Ricardo Constantino [Mon, 3 Apr 2017 18:34:09 +0000 (19:34 +0100)]
vf_pad: center image on padded area if negative x/y

or if x/y go beyond padded area.

This is mostly useful when paired with the aspect option.
Defaults aren't changed.

Idea for this was taken from mpv's soon-to-be-removed expand vf.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
3 years agodoc/libav-merge: remove line about extract_extradata_bsf usage
James Almer [Fri, 7 Apr 2017 20:31:13 +0000 (17:31 -0300)]
doc/libav-merge: remove line about extract_extradata_bsf usage

It was addressed in b8f26779d615dfb466e90627323b1a4e40639f76

3 years agoavcodec/hevc_parse: ignore all non parameter set NAL units in extradata
James Almer [Sun, 2 Apr 2017 17:35:03 +0000 (14:35 -0300)]
avcodec/hevc_parse: ignore all non parameter set NAL units in extradata

While they shouldn't be present, they are harmless if they are.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolavf: use the new bitstream filter for extracting extradata
James Almer [Fri, 24 Mar 2017 21:42:19 +0000 (18:42 -0300)]
lavf: use the new bitstream filter for extracting extradata

This merges commits 8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4 and
096a8effa3f8f3455292c958c3ed07e798def7bd by Anton Khirnov, with the
following change:

- extract_extradata_check() is added to know if the codec is supported
by the bsf before trying to initialize it. This behaviour is similar to
the old AVCodecParser.split checks.

The FATE reference changes are due to the filtered out NAL units that
the old AVCodecParser.split implementation left alone.
Decoding is unchanged as the functions that parse extradata simply
ignored said unnecessary NAL units.

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoffmpeg: use av_stream_new_side_data()
James Almer [Mon, 26 Dec 2016 21:33:06 +0000 (18:33 -0300)]
ffmpeg: use av_stream_new_side_data()

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/utvideodec: add support for gradient prediction
Paul B Mahol [Fri, 7 Apr 2017 18:09:22 +0000 (20:09 +0200)]
avcodec/utvideodec: add support for gradient prediction

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agopthread_frame: make accesses to debug field be protected by owner lock.
Ronald S. Bultje [Thu, 6 Apr 2017 17:58:59 +0000 (13:58 -0400)]
pthread_frame: make accesses to debug field be protected by owner lock.

The av_log() is done outside the lock, but this way the accesses to the
field (reads and writes) are always protected by a mutex. The av_log()
is not run inside the lock context because it may involve user callbacks
and doing that in performance-sensitive code is probably not a good idea.

This should fix occasional tsan warnings when running fate-h264, like:

WARNING: ThreadSanitizer: data race (pid=10916)
  Write of size 4 at 0x7d64000174fc by main thread (mutexes: write M2313):
    #0 update_context_from_user src/libavcodec/pthread_frame.c:335 (ffmpeg+0x000000df7b06)
[..]
  Previous read of size 4 at 0x7d64000174fc by thread T1 (mutexes: write M2311):
    #0 ff_thread_await_progress src/libavcodec/pthread_frame.c:592 (ffmpeg+0x000000df8b3e)

3 years agoh264: don't re-call ff_h264_direct_ref_list_init() w/ frame-mt.
Ronald S. Bultje [Thu, 6 Apr 2017 15:47:03 +0000 (11:47 -0400)]
h264: don't re-call ff_h264_direct_ref_list_init() w/ frame-mt.

I'm hoping that this will address the remaining tsan fate-h264 issues:

WARNING: ThreadSanitizer: data race (pid=24478)
  Read of size 8 at 0x7dbc0001c828 by main thread (mutexes: write M3243):
    #0 ff_h264_ref_picture src/libavcodec/h264_picture.c:107 (ffmpeg+0x0000013b78d8)
[..]
  Previous write of size 1 at 0x7dbc0001c82e by thread T2 (mutexes: write M3245):
    #0 ff_h264_direct_ref_list_init src/libavcodec/h264_direct.c:137 (ffmpeg+0x000001382c93)

But I'm not sure because I haven't been able to reproduce locally.

3 years agolavc/mjpegdec: allow failure while decoding APP
Clément Bœsch [Fri, 7 Apr 2017 15:50:44 +0000 (17:50 +0200)]
lavc/mjpegdec: allow failure while decoding APP

Fix decoding frame.jpg from ticket #267

Regression since 9c7ee3749 / 212c6a1d7

3 years agoavcodec/tta: Don't try to read more than MIN_CACHE_BITS bits
James Almer [Fri, 7 Apr 2017 15:48:31 +0000 (12:48 -0300)]
avcodec/tta: Don't try to read more than MIN_CACHE_BITS bits

This fixes assertion failures introduced in 4fbb56acbe.

Reviewed-by: michaelni
Reviewed-by: durandal_1707
3 years agoavcodec/h264: Check weight values to be within the specs limits.
Michael Niedermayer [Tue, 21 Mar 2017 22:46:14 +0000 (23:46 +0100)]
avcodec/h264: Check weight values to be within the specs limits.

Fixes: integer overflows
Fixes: 911/clusterfuzz-testcase-5415105606975488

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>
3 years agoMerge commit '212c6a1d70df011b6f2a2aa02f7677503287bd00'
Clément Bœsch [Fri, 7 Apr 2017 08:17:53 +0000 (10:17 +0200)]
Merge commit '212c6a1d70df011b6f2a2aa02f7677503287bd00'

* commit '212c6a1d70df011b6f2a2aa02f7677503287bd00':
  mjpegdec: Check return values of functions that may fail

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '3ee5f25d37315b27f0e2d47aa69fc445545ee2e3'
Clément Bœsch [Fri, 7 Apr 2017 08:08:53 +0000 (10:08 +0200)]
Merge commit '3ee5f25d37315b27f0e2d47aa69fc445545ee2e3'

* commit '3ee5f25d37315b27f0e2d47aa69fc445545ee2e3':
  dxva2: Adjust printf length modifiers where appropriate

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '239d02eff3ffe9f7d40caa21dde50fb4a0e94c24'
Clément Bœsch [Fri, 7 Apr 2017 08:07:43 +0000 (10:07 +0200)]
Merge commit '239d02eff3ffe9f7d40caa21dde50fb4a0e94c24'

* commit '239d02eff3ffe9f7d40caa21dde50fb4a0e94c24':
  avisynth: Cast to the right type when loading avisynth library functions

This commit is a noop, we are using dlsym() instead of GetProcAdress().

Merged-by: Clément Bœsch <u@pkh.me>
3 years agoMerge commit '3fe2a01df7f2c193805809f57b61d79607572351'
James Almer [Fri, 7 Apr 2017 04:19:56 +0000 (01:19 -0300)]
Merge commit '3fe2a01df7f2c193805809f57b61d79607572351'

* commit '3fe2a01df7f2c193805809f57b61d79607572351':
  lavc: move decoding-related code from utils.c to a new file

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '328cd2b599bc2d0d38f3c12606fa2a66eeec016e'
James Almer [Fri, 7 Apr 2017 03:42:38 +0000 (00:42 -0300)]
Merge commit '328cd2b599bc2d0d38f3c12606fa2a66eeec016e'

* commit '328cd2b599bc2d0d38f3c12606fa2a66eeec016e':
  lavc: move encoding-related code from utils.c to a new file

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '45d199d5b0b7f09eb9baa29929a3bd07ed46223b'
James Almer [Fri, 7 Apr 2017 03:31:19 +0000 (00:31 -0300)]
Merge commit '45d199d5b0b7f09eb9baa29929a3bd07ed46223b'

* commit '45d199d5b0b7f09eb9baa29929a3bd07ed46223b':
  aac_adtstoasc_bsf: validate and forward extradata if the stream is already ASC

This commit is a noop, see 6e1902bab4349a79c45807af18ebf5b50f7b436b

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '1762a39e09a3edc27d1ef7bc50070f496b893aa4'
James Almer [Fri, 7 Apr 2017 03:29:19 +0000 (00:29 -0300)]
Merge commit '1762a39e09a3edc27d1ef7bc50070f496b893aa4'

* commit '1762a39e09a3edc27d1ef7bc50070f496b893aa4':
  mss2: only use error correction for matching block counts

This commit is a noop, see 2566ad98b01538ea589e5ee07b69fc566aadc348

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee'
James Almer [Fri, 7 Apr 2017 03:28:14 +0000 (00:28 -0300)]
Merge commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee'

* commit 'd0c84c41d33ffd270d5f9fe0290e08341397fdee':
  avconv: Fix the audio next dts computation

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
3 years agoac3enc: Avoid unnecessary macro indirections
Diego Biurrun [Mon, 4 Jan 2016 10:59:00 +0000 (11:59 +0100)]
ac3enc: Avoid unnecessary macro indirections

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit 'eb135516e6f61481877163bfc55a3161d4544092'
James Almer [Fri, 7 Apr 2017 03:22:04 +0000 (00:22 -0300)]
Merge commit 'eb135516e6f61481877163bfc55a3161d4544092'

* commit 'eb135516e6f61481877163bfc55a3161d4544092':
  ac3enc: Avoid unnecessary macro indirections

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit 'f0d3e43bd77b3194a28d75884cf83083b188bf30'
James Almer [Fri, 7 Apr 2017 03:14:52 +0000 (00:14 -0300)]
Merge commit 'f0d3e43bd77b3194a28d75884cf83083b188bf30'

* commit 'f0d3e43bd77b3194a28d75884cf83083b188bf30':
  ac3enc: Reshuffle functions to avoid forward declarations

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976'
James Almer [Fri, 7 Apr 2017 03:04:37 +0000 (00:04 -0300)]
Merge commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976'

* commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976':
  ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit 'd30719e62de68975cbc7ffd318df03a183037563'
James Almer [Fri, 7 Apr 2017 03:01:00 +0000 (00:01 -0300)]
Merge commit 'd30719e62de68975cbc7ffd318df03a183037563'

* commit 'd30719e62de68975cbc7ffd318df03a183037563':
  hwcontext_vaapi: Don't abort on failing to allocate from a fixed-size pool

This commit is a noop, see 2b8151c80690a71db2cf8009855b4ae1a6abdd4c

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit '4adbb44ad154cec05e87de60bb827a13c0fe87df'
James Almer [Fri, 7 Apr 2017 02:45:20 +0000 (23:45 -0300)]
Merge commit '4adbb44ad154cec05e87de60bb827a13c0fe87df'

* commit '4adbb44ad154cec05e87de60bb827a13c0fe87df':
  tta: avoid undefined shifts

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit 'dc4b62502876c0ebeeba317233cd1348c5b0b2b7'
James Almer [Fri, 7 Apr 2017 02:43:56 +0000 (23:43 -0300)]
Merge commit 'dc4b62502876c0ebeeba317233cd1348c5b0b2b7'

* commit 'dc4b62502876c0ebeeba317233cd1348c5b0b2b7':
  tta: use get_unary() instead of a custom implementation

This commit is a noop, see 58b36959dd095c38ffd181e2b1f647b6df61773c

Merged-by: James Almer <jamrial@gmail.com>
3 years agoMerge commit 'e122b12c88487ac8766ff4eb071856b0666f0134'
James Almer [Fri, 7 Apr 2017 02:36:16 +0000 (23:36 -0300)]
Merge commit 'e122b12c88487ac8766ff4eb071856b0666f0134'

* commit 'e122b12c88487ac8766ff4eb071856b0666f0134':
  build: Drop gcrypt support

This commit is a noop. GCrypt support is exposed in configure as a
command line option, and it's independent of GnuTLS.

Merged-by: James Almer <jamrial@gmail.com>