ffmpeg.git
19 months agoavformat/http: fix stray quote in trace logging
Aman Gupta [Mon, 13 Nov 2017 19:12:52 +0000 (11:12 -0800)]
avformat/http: fix stray quote in trace logging

Signed-off-by: Aman Gupta <aman@tmm1.net>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoMAINTAINERS: add myself as videotoolbox* maintainer
Aman Gupta [Sun, 12 Nov 2017 22:16:01 +0000 (14:16 -0800)]
MAINTAINERS: add myself as videotoolbox* maintainer

Reviewed-by: Rick Kern <kernrj@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoavcodec/aacpsdsp_template: Fix integer overflows in ps_decorrelate_c()
Michael Niedermayer [Sun, 5 Nov 2017 20:20:08 +0000 (21:20 +0100)]
avcodec/aacpsdsp_template: Fix integer overflows in ps_decorrelate_c()

Fixes: runtime error: signed integer overflow: 1939661764 - -454942263 cannot be represented in type 'int'
Fixes: 3191/clusterfuzz-testcase-minimized-5688798451073024

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoavcodec/aacdec_fixed: Fix undefined shift
Michael Niedermayer [Sun, 5 Nov 2017 20:20:07 +0000 (21:20 +0100)]
avcodec/aacdec_fixed: Fix undefined shift

Fixes: runtime error: left shift of negative value -801112064
Fixes: 3492/clusterfuzz-testcase-minimized-5784775283441664

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoavcodec/mdct_*: Fix integer overflow in addition in RESCALE()
Michael Niedermayer [Sun, 5 Nov 2017 20:20:06 +0000 (21:20 +0100)]
avcodec/mdct_*: Fix integer overflow in addition in RESCALE()

Fixes: runtime error: signed integer overflow: 1219998458 - -1469874012 cannot be represented in type 'int'
Fixes: 3443/clusterfuzz-testcase-minimized-5369987105554432

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoavcodec/snowdec: Fix integer overflow in header parsing
Michael Niedermayer [Sun, 5 Nov 2017 20:20:05 +0000 (21:20 +0100)]
avcodec/snowdec: Fix integer overflow in header parsing

Fixes: 3984/clusterfuzz-testcase-minimized-5265759929368576
Fixes: runtime error: signed integer overflow: -1085585801 + -1094995529 cannot be represented in type 'int'

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoFix missing used attribute for inline assembly variables
Thomas Köppe [Sun, 12 Nov 2017 16:24:37 +0000 (16:24 +0000)]
Fix missing used attribute for inline assembly variables

Variables used in inline assembly need to be marked with attribute((used)).
Static constants already were, via the define of DECLARE_ASM_CONST.
But DECLARE_ALIGNED does not add this attribute, and some of the variables
defined with it are const only used in inline assembly, and therefore
appeared dead. This change adds a macro DECLARE_ASM_ALIGNED that marks
variables as used.

This change makes FFMPEG work with Clang's ThinLTO.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoavfilter/vf_*_qsv: Fix flags
Michael Niedermayer [Sun, 12 Nov 2017 17:07:45 +0000 (18:07 +0100)]
avfilter/vf_*_qsv: Fix flags

Reviewed-by: Mark Thompson <sw@jkqxz.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoavformat/img2enc: add frame_pts option for make output filename
Steven Liu [Mon, 13 Nov 2017 02:52:01 +0000 (10:52 +0800)]
avformat/img2enc: add frame_pts option for make output filename

fix ticket id: #1452
when use frame_pts option, the output image name can be set with PTS
of current frame.

Signed-off-by: Steven Liu <lq@onvideo.cn>
19 months agoavformat/hlsenc: allocate space for terminating null
Timo Rothenpieler [Mon, 13 Nov 2017 02:44:16 +0000 (10:44 +0800)]
avformat/hlsenc: allocate space for terminating null

Fixes CID #1420394

19 months agoconfigure: fix writing library dependencies to config.sh
James Almer [Mon, 13 Nov 2017 01:59:34 +0000 (22:59 -0300)]
configure: fix writing library dependencies to config.sh

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agolavf/tls_securetransport: build on iOS
Aman Gupta [Wed, 25 Oct 2017 18:03:14 +0000 (11:03 -0700)]
lavf/tls_securetransport: build on iOS

This works as expected on iOS, except for the ca_file feature which
is disabled because SecItemImport is not available.

Signed-off-by: Aman Gupta <aman@tmm1.net>
19 months agoavformat/ty: check cur_chunk_pos before using it
Paul B Mahol [Sun, 12 Nov 2017 21:57:06 +0000 (22:57 +0100)]
avformat/ty: check cur_chunk_pos before using it

Fixes #6831.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
19 months agoavformat/ty: fix memory leaks
Paul B Mahol [Sun, 12 Nov 2017 19:38:30 +0000 (20:38 +0100)]
avformat/ty: fix memory leaks

Signed-off-by: Paul B Mahol <onemda@gmail.com>
19 months agoavformat/ty: check if header is correctly parsed and is still present
Paul B Mahol [Sun, 12 Nov 2017 19:26:42 +0000 (20:26 +0100)]
avformat/ty: check if header is correctly parsed and is still present

Fixes #6829.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
19 months agovideotoolbox: add frame_params support
wm4 [Tue, 31 Oct 2017 14:12:24 +0000 (15:12 +0100)]
videotoolbox: add frame_params support

Allows decoding with API users which require this API.

Reviewed-by: Aman Gupta <ffmpeg@tmm1.net>
19 months agoavfilter/vf_tile: add overlap option
Paul B Mahol [Tue, 7 Nov 2017 18:41:06 +0000 (19:41 +0100)]
avfilter/vf_tile: add overlap option

Signed-off-by: Paul B Mahol <onemda@gmail.com>
19 months agoavcodec/mpeg2_metadata_bsf: fix the AVClass version number
James Almer [Sat, 11 Nov 2017 04:46:01 +0000 (01:46 -0300)]
avcodec/mpeg2_metadata_bsf: fix the AVClass version number

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: jkqxz
Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoavcodec/h265_metadata_bsf: fix the AVClass version number
James Almer [Sat, 11 Nov 2017 04:45:46 +0000 (01:45 -0300)]
avcodec/h265_metadata_bsf: fix the AVClass version number

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: jkqxz
Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoavcodec/h264_metadata_bsf: fix the AVClass version number
James Almer [Sat, 11 Nov 2017 04:45:37 +0000 (01:45 -0300)]
avcodec/h264_metadata_bsf: fix the AVClass version number

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: jkqxz
Signed-off-by: James Almer <jamrial@gmail.com>
19 months agohwcontext_vaapi: Fix build with libva 2.0
Mark Thompson [Sun, 12 Nov 2017 15:20:45 +0000 (15:20 +0000)]
hwcontext_vaapi: Fix build with libva 2.0

vaExportSurfaceHandle() wasn't included in the 2.0 release.

Fixes ticket #6828.

19 months agoavcodec/nvdec: add support for 12 bit formats
Timo Rothenpieler [Sat, 11 Nov 2017 14:07:41 +0000 (15:07 +0100)]
avcodec/nvdec: add support for 12 bit formats

19 months agoavcodec/nvdec: check hardware capabilities
Timo Rothenpieler [Sat, 11 Nov 2017 15:08:53 +0000 (16:08 +0100)]
avcodec/nvdec: check hardware capabilities

19 months agoavcodec/nvdec: don't add thread buffer twice
Timo Rothenpieler [Sun, 12 Nov 2017 14:15:55 +0000 (15:15 +0100)]
avcodec/nvdec: don't add thread buffer twice

This is already added to the initial pool size in ff_decode_get_hw_frames_ctx,
so adding it here again increases the amount of surfaces needlessly.

19 months agoMAINTAINERS: update for cuvid/nvdec changes
Timo Rothenpieler [Sat, 11 Nov 2017 13:48:37 +0000 (14:48 +0100)]
MAINTAINERS: update for cuvid/nvdec changes

19 months agolavf/dashdec: Fix several memleaks.
Carl Eugen Hoyos [Sun, 12 Nov 2017 14:20:22 +0000 (22:20 +0800)]
lavf/dashdec: Fix several memleaks.

19 months agoRevert "lavf/dashdec: Fix several memleaks."
Steven Liu [Sun, 12 Nov 2017 14:19:28 +0000 (22:19 +0800)]
Revert "lavf/dashdec: Fix several memleaks."

This reverts commit e7fe5e511aaeb3b8d949706b7f8620042cdfbd6c.

19 months agoavfilter/vf_hysteresis: allow using framesync options
Paul B Mahol [Sun, 12 Nov 2017 10:48:52 +0000 (11:48 +0100)]
avfilter/vf_hysteresis: allow using framesync options

Signed-off-by: Paul B Mahol <onemda@gmail.com>
19 months agoavfilter/vf_maskedmerge: ignore SAR from all inputs
Paul B Mahol [Sun, 12 Nov 2017 10:43:06 +0000 (11:43 +0100)]
avfilter/vf_maskedmerge: ignore SAR from all inputs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
19 months agoavfilter/vf_lut2: ignore SAR from all inputs
Paul B Mahol [Sun, 12 Nov 2017 10:40:49 +0000 (11:40 +0100)]
avfilter/vf_lut2: ignore SAR from all inputs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
19 months agoavfilter/vf_blend: ignore SAR from all inputs
Paul B Mahol [Sun, 12 Nov 2017 10:39:16 +0000 (11:39 +0100)]
avfilter/vf_blend: ignore SAR from all inputs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
19 months agoavfilter/vf_hysteresis: ignore SAR from all inputs
Paul B Mahol [Sun, 12 Nov 2017 10:35:32 +0000 (11:35 +0100)]
avfilter/vf_hysteresis: ignore SAR from all inputs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
19 months agoavfilter/vf_maskedclamp: ignore SAR from all inputs
Paul B Mahol [Sun, 12 Nov 2017 10:19:19 +0000 (11:19 +0100)]
avfilter/vf_maskedclamp: ignore SAR from all inputs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
19 months agoMerge commit '5c22c90c1d5050f1206e46494b193320ac2397cb'
James Almer [Sun, 12 Nov 2017 04:14:52 +0000 (01:14 -0300)]
Merge commit '5c22c90c1d5050f1206e46494b193320ac2397cb'

* commit '5c22c90c1d5050f1206e46494b193320ac2397cb':
  vp9_superframe_bsf: cache packets by creating new references instead of moving pointers

See 37f4a093f7f95241e4fcd582758504491e85e488
7a02b364b68c0bf7f065f5c217fae458f0efdb8d

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '0ccddbad200c1d9439c5a836501917d515cddf76'
James Almer [Sun, 12 Nov 2017 04:13:07 +0000 (01:13 -0300)]
Merge commit '0ccddbad200c1d9439c5a836501917d515cddf76'

* commit '0ccddbad200c1d9439c5a836501917d515cddf76':
  smacker: limit recursion depth of smacker_decode_bigtree

See 946ecd19ea752399bccc751c9339ff74b815587e

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'cd4663dc80323ba64989d0c103d51ad3ee0e9c2f'
James Almer [Sun, 12 Nov 2017 04:08:10 +0000 (01:08 -0300)]
Merge commit 'cd4663dc80323ba64989d0c103d51ad3ee0e9c2f'

* commit 'cd4663dc80323ba64989d0c103d51ad3ee0e9c2f':
  smacker: add sanity check for length in smacker_decode_tree()

See b829da363985cb2f80130bba304cc29a632f6446

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c'
James Almer [Sun, 12 Nov 2017 04:02:02 +0000 (01:02 -0300)]
Merge commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c'

* commit '17b6c7efb471e8ff1b8a7271f6531ba1d52bf69c':
  build: Add missing config.sh dependency for pkg-config files

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '7ebe7e8e7a76c0ce302f4f583ef0d14220031214'
James Almer [Sun, 12 Nov 2017 03:59:58 +0000 (00:59 -0300)]
Merge commit '7ebe7e8e7a76c0ce302f4f583ef0d14220031214'

* commit '7ebe7e8e7a76c0ce302f4f583ef0d14220031214':
  build: Remove pkg-config files on clean instead of on distclean

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359'
James Almer [Sun, 12 Nov 2017 03:56:25 +0000 (00:56 -0300)]
Merge commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359'

* commit 'fbf77b5ac37bf2a807d8336450801d7aecf2e359':
  build: Add uninstall-pkgconfig target to match install-lib*-pkgconfig

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'fbca6e7d162b9a7105d1059826dfe96616fa803a'
James Almer [Sun, 12 Nov 2017 03:54:37 +0000 (00:54 -0300)]
Merge commit 'fbca6e7d162b9a7105d1059826dfe96616fa803a'

* commit 'fbca6e7d162b9a7105d1059826dfe96616fa803a':
  matroskadec: allow RealAudio/Cook/Sipro streams of flavor 0

This commit is a noop, see 0d944ee34349805b29f9c91b15c8009d16df01ab

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '8e0febe28effe7f427e45190eab37110126161ea'
James Almer [Sun, 12 Nov 2017 03:51:21 +0000 (00:51 -0300)]
Merge commit '8e0febe28effe7f427e45190eab37110126161ea'

* commit '8e0febe28effe7f427e45190eab37110126161ea':
  configure: Use right variable and right value for AIX ar flags

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '22241208eb7d0168b2afc128af5a128a9ef0a89b'
James Almer [Sun, 12 Nov 2017 03:50:24 +0000 (00:50 -0300)]
Merge commit '22241208eb7d0168b2afc128af5a128a9ef0a89b'

* commit '22241208eb7d0168b2afc128af5a128a9ef0a89b':
  avconv.c: fix calculation of input file duration in seek_to_start()

This commit is a noop, see 3ddb887c88483ce089b29a30d0d0aa574c8cdc66

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '55fe72a841ba306370e68e86c88f34b4456aa4dd'
James Almer [Sun, 12 Nov 2017 03:46:52 +0000 (00:46 -0300)]
Merge commit '55fe72a841ba306370e68e86c88f34b4456aa4dd'

* commit '55fe72a841ba306370e68e86c88f34b4456aa4dd':
  matroskadec: don't warn about unknown spherical medata when none is present

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '1746c7c8f2f9a6c5eacb486426dd0a579b4b7498'
James Almer [Sun, 12 Nov 2017 03:44:26 +0000 (00:44 -0300)]
Merge commit '1746c7c8f2f9a6c5eacb486426dd0a579b4b7498'

* commit '1746c7c8f2f9a6c5eacb486426dd0a579b4b7498':
  libspeexenc: Use speex_lib_get_mode instead of the speex_foo_mode data symbols

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9'
James Almer [Sun, 12 Nov 2017 03:43:08 +0000 (00:43 -0300)]
Merge commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9'

* commit '2cf3c0ab0d84b5cdb379059f8570809a13a306b9':
  Revert "configure: Detect AIX ar command instead of hardcoding it in the OS section"

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '9b0aff51a7ae03215c4e1a3e7220fdbcfb858b08'
James Almer [Sun, 12 Nov 2017 03:40:18 +0000 (00:40 -0300)]
Merge commit '9b0aff51a7ae03215c4e1a3e7220fdbcfb858b08'

* commit '9b0aff51a7ae03215c4e1a3e7220fdbcfb858b08':
  configure: Simplify MIPS instruction set handling

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '192fe52e42f64a493c47cad1461b20fe1149dbea'
James Almer [Sun, 12 Nov 2017 03:39:41 +0000 (00:39 -0300)]
Merge commit '192fe52e42f64a493c47cad1461b20fe1149dbea'

* commit '192fe52e42f64a493c47cad1461b20fe1149dbea':
  configure: Miscellaneous minor changes to config file handling

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '14bba662d489a58fe88240fc4d14238bf17ca203'
James Almer [Sun, 12 Nov 2017 03:38:55 +0000 (00:38 -0300)]
Merge commit '14bba662d489a58fe88240fc4d14238bf17ca203'

* commit '14bba662d489a58fe88240fc4d14238bf17ca203':
  configure: Remove unused apply() helper function

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '61a17423d3711cb34a18b44e1ec2510c2f70a56c'
James Almer [Sun, 12 Nov 2017 03:38:09 +0000 (00:38 -0300)]
Merge commit '61a17423d3711cb34a18b44e1ec2510c2f70a56c'

* commit '61a17423d3711cb34a18b44e1ec2510c2f70a56c':
  configure: Miscellaneous small changes to helper functions

Merged-by: James Almer <jamrial@gmail.com>
19 months agolavc/jpeg2000dec: Fix used variables reading palette.
Carl Eugen Hoyos [Sun, 12 Nov 2017 03:29:06 +0000 (04:29 +0100)]
lavc/jpeg2000dec: Fix used variables reading palette.

Affected files with palette and colour-depth < 8.

19 months agoMerge commit '67c72f08a4707c18a67a4734660e3a23cc9488b6'
James Almer [Sun, 12 Nov 2017 03:20:34 +0000 (00:20 -0300)]
Merge commit '67c72f08a4707c18a67a4734660e3a23cc9488b6'

* commit '67c72f08a4707c18a67a4734660e3a23cc9488b6':
  configure: Stop using dlltool to create an import library

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '91760a934055ab06812885ab5ec1a97a8db6d217'
James Almer [Sun, 12 Nov 2017 03:17:23 +0000 (00:17 -0300)]
Merge commit '91760a934055ab06812885ab5ec1a97a8db6d217'

* commit '91760a934055ab06812885ab5ec1a97a8db6d217':
  dashenc: copy stream frame rate to output stream

This commit is a noop, see 3c838e6442bbe1afb7bf82942471342bcea87a27

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '4723c6226aa1ece4099338cc9b38a9cef4fa4846'
James Almer [Sun, 12 Nov 2017 03:15:57 +0000 (00:15 -0300)]
Merge commit '4723c6226aa1ece4099338cc9b38a9cef4fa4846'

* commit '4723c6226aa1ece4099338cc9b38a9cef4fa4846':
  dashenc: fix bitrate estimation with correct scaling

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '0e702124ee149593168cbbb7b30376249a64ae66'
James Almer [Sun, 12 Nov 2017 02:47:50 +0000 (23:47 -0300)]
Merge commit '0e702124ee149593168cbbb7b30376249a64ae66'

* commit '0e702124ee149593168cbbb7b30376249a64ae66':
  doc: Provide better examples for hls and segment muxing

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '9dc79b2943d99f256a3279f09580b27a95fb9aa8'
James Almer [Sun, 12 Nov 2017 02:43:36 +0000 (23:43 -0300)]
Merge commit '9dc79b2943d99f256a3279f09580b27a95fb9aa8'

* commit '9dc79b2943d99f256a3279f09580b27a95fb9aa8':
  configure: Drop support for legacy PGI compiler

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '0af8a72174108b9bb482f1073a1e9a3bc258af51'
James Almer [Sun, 12 Nov 2017 02:41:35 +0000 (23:41 -0300)]
Merge commit '0af8a72174108b9bb482f1073a1e9a3bc258af51'

* commit '0af8a72174108b9bb482f1073a1e9a3bc258af51':
  build: Drop support for legacy TI ARM compiler

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '2708c8e8efefaad337ccab1e3bf59dcde66c6bc5'
James Almer [Sun, 12 Nov 2017 02:35:00 +0000 (23:35 -0300)]
Merge commit '2708c8e8efefaad337ccab1e3bf59dcde66c6bc5'

* commit '2708c8e8efefaad337ccab1e3bf59dcde66c6bc5':
  hwcontext_vaapi: Set message callbacks on internally-created devices
  vaapi: Always free parameter buffers after vaEndPicture() with libva2
  vaapi: Remove H.264 baseline profile
  configure: Add config option for libva2 (VAAPI 1)
  vaapi: Disable deprecation warnings around use of struct vaapi_context

This commit is a noop, see
375cf55fe9f574e42bd3519f08993125ac66c725
9c7a71145b88e56cb5f67c66f6d27c20c8d06165
bd211bb866f8bf5c372589fc44dc06d1a9509c0a
e339411691e3671b595e556ba3411c1acb8c4692
f3602875b3255c533900df1c7bb4e78ef5e1ce08

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb'
James Almer [Sun, 12 Nov 2017 02:30:31 +0000 (23:30 -0300)]
Merge commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb'

* commit 'b487add7ecf78efda36d49815f8f8757bd24d4cb':
  arm: Remove a redundant check in fmtconvert_init_arm.c

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '17f5171cd4753e7f50e6d95df069bccbc90265bf'
James Almer [Sun, 12 Nov 2017 02:29:52 +0000 (23:29 -0300)]
Merge commit '17f5171cd4753e7f50e6d95df069bccbc90265bf'

* commit '17f5171cd4753e7f50e6d95df069bccbc90265bf':
  arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp
  lavc: fix hw_device_ctx operation

This commit is a noop, see
48e4eda11d537c6ed52d1000aaa6ce5cbb641e25
f1fd12ef858cf7efe843aa3063894a11b2d1e7d5

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '68649bfed30a35dc3e45ea240541b2774b2f282b'
James Almer [Sun, 12 Nov 2017 02:21:55 +0000 (23:21 -0300)]
Merge commit '68649bfed30a35dc3e45ea240541b2774b2f282b'

* commit '68649bfed30a35dc3e45ea240541b2774b2f282b':
  configure: Group system feature variables and system libraries together

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'cbcdb2d8e47f62f69accee62c08f487a27848174'
James Almer [Sun, 12 Nov 2017 02:15:09 +0000 (23:15 -0300)]
Merge commit 'cbcdb2d8e47f62f69accee62c08f487a27848174'

* commit 'cbcdb2d8e47f62f69accee62c08f487a27848174':
  build: Delete compiler-generated compat files on 'make clean'

See
d100dc6c9955af8b7a7a60a37a362a51c819222e
a2ca9e11ff7166cbbc0314d152702a201f6a14fb

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '62be1caf161c1241a9e148f347850cfe092588dc'
James Almer [Sun, 12 Nov 2017 02:11:44 +0000 (23:11 -0300)]
Merge commit '62be1caf161c1241a9e148f347850cfe092588dc'

* commit '62be1caf161c1241a9e148f347850cfe092588dc':
  configure: Bail out early if neither static nor shared libs are built

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'c6496de33456f20144b994ac38f308f2de333608'
James Almer [Sun, 12 Nov 2017 02:09:21 +0000 (23:09 -0300)]
Merge commit 'c6496de33456f20144b994ac38f308f2de333608'

* commit 'c6496de33456f20144b994ac38f308f2de333608':
  configure: Move enabling libc_type into probe_libc() function

Merged-by: James Almer <jamrial@gmail.com>
19 months agoavcodec/Makefile: build libxvid_rc.o only if libxvid_encoder is enabled
James Almer [Sun, 12 Nov 2017 01:25:12 +0000 (22:25 -0300)]
avcodec/Makefile: build libxvid_rc.o only if libxvid_encoder is enabled

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agonvdec: add frames_params support
wm4 [Sat, 28 Oct 2017 17:53:38 +0000 (19:53 +0200)]
nvdec: add frames_params support

19 months agoMerge commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24'
James Almer [Sat, 11 Nov 2017 21:58:12 +0000 (18:58 -0300)]
Merge commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24'

* commit 'b46a77f19ddc4b2b5fa3187835ceb602a5244e24':
  lavc: external hardware frame pool initialization

Includes the fix from e724bdfffbd3c27aac53d1f32f20f105f37caef0

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d'
James Almer [Sat, 11 Nov 2017 21:09:11 +0000 (18:09 -0300)]
Merge commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d'

* commit 'ec0f4fa17ce29cf01d4def21041b0b87f7e3105d':
  FATE: add a test for the H.264 sample fixed by 7c4f6f6

Merged-by: James Almer <jamrial@gmail.com>
19 months agoRevert "Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'"
James Almer [Sat, 11 Nov 2017 21:04:22 +0000 (18:04 -0300)]
Revert "Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'"

This reverts commit 1a4315f24d2c5857ebeb379fe39f0124746ee30a, reversing
changes made to 869401cefc22e221edbf135bacaa1f21014fd001.

At least one distro (Arch) ships gsm.h inside the gsm/ folder

19 months agoMerge commit '98afe3fb71afd4a18009924aaba56bc577bbd400'
James Almer [Sat, 11 Nov 2017 20:49:35 +0000 (17:49 -0300)]
Merge commit '98afe3fb71afd4a18009924aaba56bc577bbd400'

* commit '98afe3fb71afd4a18009924aaba56bc577bbd400':
  qsv: Make the hevc idr_interval consistent with the h264 one

This commit is a noop, see 643e3369369f77035a6c03a50752416d26cbf947

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '41df62fd674bd0c67f7b6952381d235a393245d6'
James Almer [Sat, 11 Nov 2017 20:48:11 +0000 (17:48 -0300)]
Merge commit '41df62fd674bd0c67f7b6952381d235a393245d6'

* commit '41df62fd674bd0c67f7b6952381d235a393245d6':
  configure: Set the default assembler to armasm64 for MSVC for arm64

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '732510636e597585a79be7d111c88b3f7e174fe7'
James Almer [Sat, 11 Nov 2017 20:47:10 +0000 (17:47 -0300)]
Merge commit '732510636e597585a79be7d111c88b3f7e174fe7'

* commit '732510636e597585a79be7d111c88b3f7e174fe7':
  aarch64: Remove a dot from a label

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d'
James Almer [Sat, 11 Nov 2017 20:46:48 +0000 (17:46 -0300)]
Merge commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d'

* commit '69ac24e556c6fbc7138be5a60d0b90d2a5676c3d':
  aarch64: Get rid of a stray double space

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'fbd63170bcbc5cad8965edad7c357f6eb4132250'
James Almer [Sat, 11 Nov 2017 20:45:37 +0000 (17:45 -0300)]
Merge commit 'fbd63170bcbc5cad8965edad7c357f6eb4132250'

* commit 'fbd63170bcbc5cad8965edad7c357f6eb4132250':
  cbs: Add test dependencies
  mss1: Add missing macro parameters to ARITH_GET_* macros

This commit is a noop, see
cbeaf678889baeaac0776305f3ca289318a1aca7
809b0402dc916b876dfdd6bb9c88f171cf3e77c0

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '077011b5af2b3150efc52a9b58f5ef9bb0235087'
James Almer [Sat, 11 Nov 2017 20:25:57 +0000 (17:25 -0300)]
Merge commit '077011b5af2b3150efc52a9b58f5ef9bb0235087'

* commit '077011b5af2b3150efc52a9b58f5ef9bb0235087':
  qsv: Expose idr_interval for hevc as well

Also includes 98afe3fb71afd4a18009924aaba56bc577bbd400.

Merged-by: James Almer <jamrial@gmail.com>
19 months agodoc/libav-merge: mention more skipped outdev removal commits
James Almer [Sat, 11 Nov 2017 20:17:30 +0000 (17:17 -0300)]
doc/libav-merge: mention more skipped outdev removal commits

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '762ab2de6ead68cfe6617d1960921878ddece9e1'
James Almer [Sat, 11 Nov 2017 20:15:09 +0000 (17:15 -0300)]
Merge commit '762ab2de6ead68cfe6617d1960921878ddece9e1'

* commit '762ab2de6ead68cfe6617d1960921878ddece9e1':
  Remove dv1394 input device
  avfoundation: Drop silly _dec suffix from filename
  alsa: Coalesce source files after outdev removal
  oss: Coalesce source files after outdev removal
  sndio: Coalesce source files after outdev removal

This commit is a noop, see 56d2154b72fba96a65b806ecf4a6f85c3f69b021

Merged-by: James Almer <jamrial@gmail.com>
19 months agodoc/libav-merge: mention skipped outdev removal commit
James Almer [Sat, 11 Nov 2017 20:12:08 +0000 (17:12 -0300)]
doc/libav-merge: mention skipped outdev removal commit

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '8e7e042d41ac42f01d5573a4b0f7d9060356bd46'
James Almer [Sat, 11 Nov 2017 20:07:37 +0000 (17:07 -0300)]
Merge commit '8e7e042d41ac42f01d5573a4b0f7d9060356bd46'

* commit '8e7e042d41ac42f01d5573a4b0f7d9060356bd46':
  Remove all output devices

This commit is a noop. Such a change needs consensus from the project.

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'eb3c1a94adbc28411610167d3dac583436e50125'
James Almer [Sat, 11 Nov 2017 20:03:03 +0000 (17:03 -0300)]
Merge commit 'eb3c1a94adbc28411610167d3dac583436e50125'

* commit 'eb3c1a94adbc28411610167d3dac583436e50125':
  pictor: Correctly check frame dimensions

This commit is a noop, see 8c2ea3030af7b40a3c4275696fb5c76cdb80950a

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed'
James Almer [Sat, 11 Nov 2017 19:59:36 +0000 (16:59 -0300)]
Merge commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed'

* commit 'a37e84be69310cd7de9540c8bc194cb0a6d158ed':
  makedef: Add support for identifying the ARM64 machine type

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a'
James Almer [Sat, 11 Nov 2017 19:58:15 +0000 (16:58 -0300)]
Merge commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a'

* commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a':
  configure: Add a comment about why we don't try to enable pic on arm on target_os=win32

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '0ca66409911e9fba940424be8bdfa54e056b0a4b'
James Almer [Sat, 11 Nov 2017 19:56:59 +0000 (16:56 -0300)]
Merge commit '0ca66409911e9fba940424be8bdfa54e056b0a4b'

* commit '0ca66409911e9fba940424be8bdfa54e056b0a4b':
  configure: Don't add -fPIC to asflags when targeting windows

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'f951837ce58e8588b175fb53a76fd453a81528ec'
James Almer [Sat, 11 Nov 2017 19:55:43 +0000 (16:55 -0300)]
Merge commit 'f951837ce58e8588b175fb53a76fd453a81528ec'

* commit 'f951837ce58e8588b175fb53a76fd453a81528ec':
  configure: Don't add -fPIC to cflags for target_os=win32

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c'
James Almer [Sat, 11 Nov 2017 19:53:19 +0000 (16:53 -0300)]
Merge commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c'

* commit '7ac092d05de487d088bc96ab4a7bd6207fbfa98c':
  build: CryptGenRandom --> wincrypt, it is a better name

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '93797681c2310faeeb0158f66f471965213904c6'
James Almer [Sat, 11 Nov 2017 19:50:35 +0000 (16:50 -0300)]
Merge commit '93797681c2310faeeb0158f66f471965213904c6'

* commit '93797681c2310faeeb0158f66f471965213904c6':
  build: Rename stdatomic_h variable to stdatomic

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '62d5b5a9d3b0181335072d6fa792f2d805bc27b6'
James Almer [Sat, 11 Nov 2017 19:45:00 +0000 (16:45 -0300)]
Merge commit '62d5b5a9d3b0181335072d6fa792f2d805bc27b6'

* commit '62d5b5a9d3b0181335072d6fa792f2d805bc27b6':
  configure: Extend check_header() to allow checking for multiple headers

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'
James Almer [Sat, 11 Nov 2017 19:42:27 +0000 (16:42 -0300)]
Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'

* commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f':
  build: Merge mach/mach_time.h and mach_absolute_time() checks

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '4f6401df43d7ee9082ea591037b9f9284217d834'
James Almer [Sat, 11 Nov 2017 19:40:20 +0000 (16:40 -0300)]
Merge commit '4f6401df43d7ee9082ea591037b9f9284217d834'

* commit '4f6401df43d7ee9082ea591037b9f9284217d834':
  configure: Merge separate parts of GnuTLS test
  configure: Simplify nvenc check (and move it to the correct spot)
  configure: Drop fallback for deprecated avserver command line options
  configure: Drop feature for randomly disabling/enabling components

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '010baac12a14d684a1ae72f6b7509e642c40f3b3'
James Almer [Sat, 11 Nov 2017 19:33:06 +0000 (16:33 -0300)]
Merge commit '010baac12a14d684a1ae72f6b7509e642c40f3b3'

* commit '010baac12a14d684a1ae72f6b7509e642c40f3b3':
  configure: Fix stupid typo in gsm.h header name

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '76481f57b528168b00035aee76f7e0878669011f'
James Almer [Sat, 11 Nov 2017 19:31:40 +0000 (16:31 -0300)]
Merge commit '76481f57b528168b00035aee76f7e0878669011f'

* commit '76481f57b528168b00035aee76f7e0878669011f':
  configure: Remove pointless empty *_COMPONENTS variables

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '1c047c8f4d5e016e89250afdeb88a4fea707cc1c'
James Almer [Sat, 11 Nov 2017 19:30:11 +0000 (16:30 -0300)]
Merge commit '1c047c8f4d5e016e89250afdeb88a4fea707cc1c'

* commit '1c047c8f4d5e016e89250afdeb88a4fea707cc1c':
  configure: Drop stray extralibs for libspeex

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '3e5950287317938e6b81e7ef8f024b403c303289'
James Almer [Sat, 11 Nov 2017 19:28:42 +0000 (16:28 -0300)]
Merge commit '3e5950287317938e6b81e7ef8f024b403c303289'

* commit '3e5950287317938e6b81e7ef8f024b403c303289':
  configure: Drop unused attribute checks

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '421c10ed4fb0475a2cb055dd130ba12a6adb9f70'
James Almer [Sat, 11 Nov 2017 19:23:48 +0000 (16:23 -0300)]
Merge commit '421c10ed4fb0475a2cb055dd130ba12a6adb9f70'

* commit '421c10ed4fb0475a2cb055dd130ba12a6adb9f70':
  configure: Drop test for fork()

We keep the check as it's needed by the http_multiclient example.

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'
James Almer [Sat, 11 Nov 2017 19:18:52 +0000 (16:18 -0300)]
Merge commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784'

* commit 'b586903ae1b89e2d8b99c79f33cabe9b3ca03784':
  build: Drop redundant check for soundcard.h

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '8e97a8c69162afce47abea96c8c0914f3550e212'
James Almer [Sat, 11 Nov 2017 19:12:16 +0000 (16:12 -0300)]
Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'

* commit '8e97a8c69162afce47abea96c8c0914f3550e212':
  build: Remove check for gsm/gsm.h for libgsm

Also includes fix from 010baac12a14d684a1ae72f6b7509e642c40f3b3

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'
James Almer [Sat, 11 Nov 2017 19:09:09 +0000 (16:09 -0300)]
Merge commit '29ccc641b17afad058a5c24071ea827865a8b3a9'

* commit '29ccc641b17afad058a5c24071ea827865a8b3a9':
  build: Drop check for sys/mman.h in favor of mmap() check

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'e7168d4c0cb279cf267690549ca92ad564572bc6'
James Almer [Sat, 11 Nov 2017 19:05:45 +0000 (16:05 -0300)]
Merge commit 'e7168d4c0cb279cf267690549ca92ad564572bc6'

* commit 'e7168d4c0cb279cf267690549ca92ad564572bc6':
  configure: Drop redundant header check for d3d11.h

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '4064f42889685e7122cfad4934b060098c147753'
James Almer [Sat, 11 Nov 2017 19:03:21 +0000 (16:03 -0300)]
Merge commit '4064f42889685e7122cfad4934b060098c147753'

* commit '4064f42889685e7122cfad4934b060098c147753':
  build: Drop explicit check for dlfcn.h

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'fca9ca539c8c6e4fe0072486c7e0479a08a15e7c'
James Almer [Sat, 11 Nov 2017 19:00:30 +0000 (16:00 -0300)]
Merge commit 'fca9ca539c8c6e4fe0072486c7e0479a08a15e7c'

* commit 'fca9ca539c8c6e4fe0072486c7e0479a08a15e7c':
  configure: Drop unused or internally-used entries from variable lists

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '09c98327b9f25c6c1716c0ee82ce09d8b484887a'
James Almer [Sat, 11 Nov 2017 18:56:27 +0000 (15:56 -0300)]
Merge commit '09c98327b9f25c6c1716c0ee82ce09d8b484887a'

* commit '09c98327b9f25c6c1716c0ee82ce09d8b484887a':
  build: Drop support for Tru64 Unix (OSF/1)

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