]>
git.sesse.net Git - ffmpeg/log
Aman Gupta [Mon, 25 Sep 2017 23:44:47 +0000 (16:44 -0700)]
avcodec/videotoolbox: print descriptive errors on decode failures
Signed-off-by: Aman Gupta <aman@tmm1.net>
Aman Gupta [Mon, 25 Sep 2017 23:42:18 +0000 (16:42 -0700)]
avcodec/videotoolbox: reset bitstream_size in end_frame
This allows decode_slice to be invoked multiple times before end_frame,
causing slices to accumulate before being fed into the VT decoder.
An upcoming commit will re-use decode_slice for parameter NALUs, so
they can be propagated into the VT decoder session along with slice
data.
Signed-off-by: Aman Gupta <aman@tmm1.net>
Aman Gupta [Mon, 25 Sep 2017 23:32:11 +0000 (16:32 -0700)]
avcodec/videotoolbox: extract videotoolbox_{start,stop} helpers
These helpers will be used in later commits to automatically restart
the decoder session when SPS changes are encountered.
Signed-off-by: Aman Gupta <aman@tmm1.net>
Aman Gupta [Fri, 10 Nov 2017 19:59:05 +0000 (11:59 -0800)]
avcodec/videotoolbox: use early return in videotoolbox_default_free
Cosmetic change only.
Signed-off-by: Aman Gupta <aman@tmm1.net>
Aman Gupta [Sun, 12 Nov 2017 18:20:17 +0000 (10:20 -0800)]
avcodec/videotoolboxenc: re-indent code
Cosmetic change only.
Signed-off-by: Aman Gupta <aman@tmm1.net>
Aman Gupta [Sun, 12 Nov 2017 18:19:17 +0000 (10:19 -0800)]
avcodec/videotoolboxenc: add hevc_videotoolbox encoder
Signed-off-by: Aman Gupta <aman@tmm1.net>
Reviewed-by: Rodger Combs <rodger.combs@gmail.com>
Timo Rothenpieler [Mon, 13 Nov 2017 21:01:53 +0000 (22:01 +0100)]
configure: factorize nvdec dependencies
Timo Rothenpieler [Mon, 13 Nov 2017 20:55:09 +0000 (21:55 +0100)]
configure: fix cuda dependency on nvdec
Aman Gupta [Mon, 13 Nov 2017 21:02:44 +0000 (15:02 -0600)]
This fixes a deadlock while reading a chunked https response, if
multiple_requests=1 is also set. Without an EOF to signal the end of
the last chunk, tls_read gets stuck forever trying to read more data
than is available. This occurs with the http protocol reproducibly,
because http.c always reads 4kb at a time, and the last chunk of an
http response is often much smaller.
After this commit, tls_read always returns any buffered plaintext
first before attempting to read more encrypted data off the
underlying tcp socket.
Signed-off-by: Rodger Combs <rodger.combs@gmail.com>
Rodger Combs [Mon, 13 Nov 2017 20:46:17 +0000 (14:46 -0600)]
lavf/tls_securetransport: handle incomplete reads gracefully
Signed-off-by: Aman Gupta <aman at tmm1.net>
James Almer [Mon, 13 Nov 2017 20:37:56 +0000 (17:37 -0300)]
Makefile: fix distclean target
It must imply clean. Regression since
e0087a5624117a1d643e2cb433ecc4d536756dda .
Signed-off-by: James Almer <jamrial@gmail.com>
Timo Rothenpieler [Wed, 8 Nov 2017 18:17:52 +0000 (19:17 +0100)]
movenc-test: fix potential uninitialized read
Fixes CID #
1413023
Timo Rothenpieler [Wed, 8 Nov 2017 18:17:51 +0000 (19:17 +0100)]
avfilter/vf_premultiply: fix memory-leak on failure
Fixes CID #
1416352
Timo Rothenpieler [Wed, 8 Nov 2017 18:17:49 +0000 (19:17 +0100)]
avformat/fitsenc: validate input pixel format
Fixes CID #
1416961 and #
1416962
Timo Rothenpieler [Wed, 8 Nov 2017 18:17:45 +0000 (19:17 +0100)]
lavfi/paletteuse: check get_color return value
Fixes CID #
1420396
Timo Rothenpieler [Sun, 12 Nov 2017 20:04:57 +0000 (21:04 +0100)]
avcodec/nvdec: fix return value on error
Timo Rothenpieler [Sun, 12 Nov 2017 17:09:31 +0000 (18:09 +0100)]
avcodec/nvdec: warn about thread count if applicable
Timo Rothenpieler [Sat, 11 Nov 2017 20:19:07 +0000 (21:19 +0100)]
avcodec: implement vp9 nvdec hwaccel
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>
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>
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>
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>
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>
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>
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>
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>
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>
Timo Rothenpieler [Mon, 13 Nov 2017 02:44:16 +0000 (10:44 +0800)]
avformat/hlsenc: allocate space for terminating null
Fixes CID #
1420394
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>
James Almer [Mon, 13 Nov 2017 01:56:45 +0000 (22:56 -0300)]
configure: fix writing library dependencies to config.sh
Signed-off-by: James Almer <jamrial@gmail.com>
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>
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>
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>
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>
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>
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>
Mark Thompson [Thu, 9 Nov 2017 01:04:39 +0000 (01:04 +0000)]
vaapi_h264: Add missing return value check
Mark Thompson [Thu, 9 Nov 2017 01:04:34 +0000 (01:04 +0000)]
h264_metadata: Fix clearing SEI payload in error case
Mark Thompson [Thu, 9 Nov 2017 01:04:30 +0000 (01:04 +0000)]
cbs_h2645: Fix memory leak on when reading SEI fails
Mark Thompson [Thu, 9 Nov 2017 01:04:11 +0000 (01:04 +0000)]
cbs: Add a missing return value check
Mark Thompson [Sun, 1 Oct 2017 21:55:24 +0000 (22:55 +0100)]
vaapi_h264: Do not use deprecated header type
SEI headers should be inserted as generic raw data (the old specific
type has been deprecated in libva2).
Mark Thompson [Tue, 24 Oct 2017 23:15:55 +0000 (00:15 +0100)]
vaapi_h264: Add workaround for bad SEI in old Intel drivers
With pre-2.0 Intel drivers in CBR mode, if an explicit SEI message with
the old (now deprecated) type is not included, the driver generates and
inserts some timing SEI which is almost certainly invlaid. Before
7a4fac5e91789b73e07bd4ad20493cfde028df76 we always inserted our own SEI
so this would not be visible, but since then it has been possible to
disable that. We would also like to avoid using the deprecated type,
and using the new type, while working in old drivers, does not suppress
the spurious message like the old type does.
Therefore, suppress the bad SEI insertion by providing a zero-length
buffer with the old type, which the driver can insert harmlessly.
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>
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>
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>
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.
Timo Rothenpieler [Sat, 11 Nov 2017 14:07:41 +0000 (15:07 +0100)]
avcodec/nvdec: add support for 12 bit formats
Timo Rothenpieler [Sat, 11 Nov 2017 15:08:53 +0000 (16:08 +0100)]
avcodec/nvdec: check hardware capabilities
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.
Timo Rothenpieler [Sat, 11 Nov 2017 13:48:37 +0000 (14:48 +0100)]
MAINTAINERS: update for cuvid/nvdec changes
Carl Eugen Hoyos [Sun, 12 Nov 2017 14:20:22 +0000 (22:20 +0800)]
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 .
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
James Almer [Sun, 12 Nov 2017 02:15:09 +0000 (23:15 -0300)]
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>
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>
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>
wm4 [Sat, 28 Oct 2017 17:53:38 +0000 (19:53 +0200)]
nvdec: add frames_params support
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>
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>
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
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>
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>
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>
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>
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>
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>
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>