OSDN Git Service
Paul B Mahol [Fri, 14 Apr 2017 14:09:07 +0000 (16:09 +0200)]
avcodec/dnxhd*: add ff_dnxhd_get_hr_frame_size()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Fri, 14 Apr 2017 14:00:35 +0000 (16:00 +0200)]
avcodec/dnxhdenc: make sure that mb_height > 255 can be stored
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Rostislav Pehlivanov [Wed, 12 Apr 2017 22:26:34 +0000 (23:26 +0100)]
opus_pvq: add resynth support and band encoding cost function
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
James Almer [Fri, 14 Apr 2017 00:03:41 +0000 (21:03 -0300)]
build: fix tools build dependencies
Found-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 22:57:31 +0000 (19:57 -0300)]
Merge commit '
92e6b31c3b31be5d6fcad6bf0030bea86a1c8360'
* commit '
92e6b31c3b31be5d6fcad6bf0030bea86a1c8360':
dxva2: Adjust multiple inclusion guard names to follow convention
This commit is a noop, see
180f9a09588d1c68983692bb5245213956fdde11
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 22:56:17 +0000 (19:56 -0300)]
Merge commit '
dbfe60caca2e8323efa7aba6762dce7be2eba390'
* commit '
dbfe60caca2e8323efa7aba6762dce7be2eba390':
vf_hwupload_cuda: Add min/max limits for device option
This commit is a noop, see4df5a6a26a8aa08bbc6d027c2fb44fcf870e98d7
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 22:53:14 +0000 (19:53 -0300)]
Merge commit '
4efea4ce75fbea3e5f8be8040068bfaaffbb2718'
* commit '
4efea4ce75fbea3e5f8be8040068bfaaffbb2718':
APIChanges: Mention where release 12 was cut
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 22:49:20 +0000 (19:49 -0300)]
Merge commit '
3f75e5116b900f1428aa13041fc7d6301bf1988a'
* commit '
3f75e5116b900f1428aa13041fc7d6301bf1988a':
avio: Keep track of the amount of data written
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 22:04:26 +0000 (19:04 -0300)]
Merge commit '
fc85646ad495f3418042468da415af73a7a07334'
* commit '
fc85646ad495f3418042468da415af73a7a07334':
libopusdec: fix out-of-bounds read
libschroedingerdec: fix leaking of framewithpts
libschroedingerdec: don't produce empty frames
This commit is a noop, see
a86ebbf7f641bc797002ddea7fb517759722cd1b
3c0328d58d98664b05efdd377d3fe66a569d385e
8c8f543b81aa2b50bb6a6cfd370a0061281492a3
Merged-by: James Almer <jamrial@gmail.com>
Aaron Levinson [Thu, 13 Apr 2017 09:38:02 +0000 (02:38 -0700)]
Support building C++ files with MSVC
Made appropriate changes to be able to successfully
build C++ files using a Visual C++ build on Windows.
Based on an earlier patch by Kyle Schwarz.
Comments:
-- compat/w32pthreads.h: Made appropriate changes to w32pthreads.h to
get it to build when it is being included in a C++ file and built
with Visual C++. This is mostly a copy of Kyle Schwarz's patch as
described above.
-- configure:
a) Now calling set_ccvars CXX to cause the various CXX_ variables to
be setup properly. For example, with MSVC (Microsoft Visual C++),
this causes CXX_O to be set to -Fo$@ instead of using the default
value. The default value does not work with Visual C++. This
change will also have the impact of correcting CXX_O (and possibly
CXX_C) for other compilers, although this is really only relevant
for the Intel compiler, in addition to MSVC.
b) Now using cl for the C++ compiler for the MSVC toolchain. This is
currently only relevant for building the
Blackmagic/Decklink-related files under avdevice.
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
James Almer [Thu, 13 Apr 2017 21:31:44 +0000 (18:31 -0300)]
Merge commit '
d3da8a0035734529c4e26696c9a0c6cb56633838'
* commit '
d3da8a0035734529c4e26696c9a0c6cb56633838':
omx: Fix allocation check
This commit is a noop, see
16a75304fe42d3a007c78126b6370c94ccf891f6
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:29:26 +0000 (18:29 -0300)]
Merge commit '
d32bdadda86b35c2960e4de877cf081b9d2dadb3'
* commit '
d32bdadda86b35c2960e4de877cf081b9d2dadb3':
qsvdec: Fix memory leak on error
This commit is a noop, see
b6f80b16d1a82463a77352b8756e1cdcaa3a33d0
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:27:20 +0000 (18:27 -0300)]
Merge commit '
6a93b596c5c3af31b843d63013a7985ffeea354d'
* commit '
6a93b596c5c3af31b843d63013a7985ffeea354d':
compat/atomics: add typecasts in atomic_compare_exchange_strong()
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:25:30 +0000 (18:25 -0300)]
Merge commit '
2170017a1cd033b6f28e16476921022712a522d8'
* commit '
2170017a1cd033b6f28e16476921022712a522d8':
avutil: fix data race in av_get_cpu_flags()
This commit is a noop, see
fed50c4304eecb352e29ce789cdb96ea84d6162f
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:18:54 +0000 (18:18 -0300)]
Merge commit '
d5759701a82926059ae3e2530805e900041a5419'
* commit '
d5759701a82926059ae3e2530805e900041a5419':
libkvazaar: Add missing header #includes
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:17:09 +0000 (18:17 -0300)]
Merge commit '
892acc70105df9e6f7773bdde85b3e9541098525'
* commit '
892acc70105df9e6f7773bdde85b3e9541098525':
configure: Fail if cuda was enabled and is not available
This commit is a noop. Our CUDA implementation is autodectected.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 21:15:39 +0000 (18:15 -0300)]
configure: add missing golomb dependency to hevcparse
Based on a dependency addition from
fbec58daa2351cbe9fc758d8735c23ff03313db4
James Almer [Thu, 13 Apr 2017 21:14:04 +0000 (18:14 -0300)]
Merge commit '
f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a'
* commit '
f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a':
build: Drop stray golomb dependencies
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:56:55 +0000 (17:56 -0300)]
Merge commit '
fbec58daa2351cbe9fc758d8735c23ff03313db4'
* commit '
fbec58daa2351cbe9fc758d8735c23ff03313db4':
build: Add an internal component for hevc_ps code
This commit is a noop, see
498e9e8e2a67e022c189f44fa33350b4f4a7979b
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:54:02 +0000 (17:54 -0300)]
Merge commit '
f912fd767e55bbb5a1554bd99bacab007659609c'
* commit '
f912fd767e55bbb5a1554bd99bacab007659609c':
Add missing #includes for standalone spherical-information-related headers
fate: Add spherical and stereo3d mov tests
avprobe: Allow specifying multiple stream entries to be shown
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:49:44 +0000 (17:49 -0300)]
Merge commit '
e90137c045721a1635cc241eb1e1be1126389c38'
* commit '
e90137c045721a1635cc241eb1e1be1126389c38':
mov: Export spherical information
lavc: Add spherical packet side data API
lavu: Add AVSphericalMapping type and frame side data
This commit is a noop, see
8f58ecc344a92e63193c38e28c173be987954bbb
e7a6f8c972a0b5b98ef7bbf393e95c434e9e2539
4dcdecf4719a9893f3825ebbad80b2af5aa23613
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:31:15 +0000 (17:31 -0300)]
Merge commit '
075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8'
* commit '
075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8':
lavu: Add a video section to Doxygen documentation
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:27:43 +0000 (17:27 -0300)]
Merge commit '
624aa8ab221cf34693f9a8c5ab67219cf560f2bb'
* commit '
624aa8ab221cf34693f9a8c5ab67219cf560f2bb':
build: Add missing Makefile entries and ifdefs for QSV hwaccels
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:22:58 +0000 (17:22 -0300)]
Merge commit '
c833c2034f4ee77fe2ee3470f3f5f84415673b3b'
* commit '
c833c2034f4ee77fe2ee3470f3f5f84415673b3b':
build: Ensure that the "all" target appears before all Makefile includes
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:20:50 +0000 (17:20 -0300)]
Merge commit '
6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'
* commit '
6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a':
build: Have old H.264/HEVC nvenc encoders select their new counterparts
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:09:52 +0000 (17:09 -0300)]
Merge commit '
3e105d08848162b90d886bde59c010d4b0362a4b'
* commit '
3e105d08848162b90d886bde59c010d4b0362a4b':
build: Move entries related to building TOOLS to a subdirectory Makefile
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:06:05 +0000 (17:06 -0300)]
Merge commit '
4104cc56225f29ce1cded8b2876f8748460232a6'
* commit '
4104cc56225f29ce1cded8b2876f8748460232a6':
build: Warn that reconfiguration is necessary if version.h files changed
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:03:31 +0000 (17:03 -0300)]
Merge commit '
f22da2cdf90dc892d483e2d4003cffc0500816f6'
* commit '
f22da2cdf90dc892d483e2d4003cffc0500816f6':
configure: add -fPIE instead of -pie to C flags for ThreadSanitizer
This commit is a noop, see
3f55752cd566c68ff3d3ae984a3936c1d08ef8ca
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 13 Apr 2017 20:01:01 +0000 (17:01 -0300)]
Merge commit '
404cb74793284aa03e2e1a7e911c980c4cba0e9e'
* commit '
404cb74793284aa03e2e1a7e911c980c4cba0e9e':
configure: Pass CFLAGS_HEADERS through the right CFLAGS filter
Merged-by: James Almer <jamrial@gmail.com>
Hendrik Leppkes [Thu, 13 Apr 2017 09:05:50 +0000 (11:05 +0200)]
Merge commit '
9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'
* commit '
9265364bec0af2e8b7c3a6de7bfc8291a0b70bca':
build: Separate avisynth and avxsynth support
Mostly noop, since it could break linux configure with --enable-avisynth,
and the configure code which was simplified isn't even present in
ffmpeg.
Only merged the cosmetic re-ordering in the Makefile.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Carl Eugen Hoyos [Thu, 13 Apr 2017 06:19:48 +0000 (08:19 +0200)]
tests: Fix gray10 and gray12 references after
c1616b45.
James Almer [Wed, 12 Apr 2017 22:38:17 +0000 (19:38 -0300)]
avcodec/aacenc_ltp: fix use of uninitialized values
Fixes some valgrind warnings.
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Matthew Gregan [Wed, 12 Apr 2017 02:12:17 +0000 (14:12 +1200)]
avformat/movenc: Fix potential leak of sgpd_entries array.
Signed-off-by: Matthew Gregan <kinetik@flim.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Tue, 4 Apr 2017 10:24:41 +0000 (12:24 +0200)]
lsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16.
Carl Eugen Hoyos [Tue, 28 Mar 2017 21:55:01 +0000 (23:55 +0200)]
lavf/isom: Remove codec point for WMAv2 that has never worked.
Carl Eugen Hoyos [Wed, 12 Apr 2017 20:49:06 +0000 (22:49 +0200)]
configure: Fix decklink license dependency.
Marton Balint [Wed, 5 Apr 2017 18:17:48 +0000 (20:17 +0200)]
ffprobe: only use custom logging callback if -show_log is set
The custom callback can cause significant CPU usage on Windows for some large
files with many index entries for some reason.
v2: Move check after parsing options.
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Sat, 8 Apr 2017 12:55:51 +0000 (14:55 +0200)]
tests/fate/filter-video: fix framerate filter tests
Signed-off-by: Marton Balint <cus@passwd.hu>
Marton Balint [Tue, 4 Apr 2017 23:41:15 +0000 (01:41 +0200)]
avfilter/vf_framerate: always request input if no output is provided in request_frame
Fixes ticket #6285.
Signed-off-by: Marton Balint <cus@passwd.hu>
James Almer [Wed, 12 Apr 2017 00:29:09 +0000 (21:29 -0300)]
x86/float_dsp: add ff_vector_fmul_reverse_avx2
~20% faster than AVX.
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Wed, 12 Apr 2017 00:01:37 +0000 (02:01 +0200)]
doc/APIchanges: Fill in missing fields
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 11 Apr 2017 21:22:19 +0000 (23:22 +0200)]
avformat/movenc: Fix mix of declaration and statement
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Tue, 11 Apr 2017 20:12:21 +0000 (17:12 -0300)]
checkasm: add fixed_dsp tests
Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Matthew Gregan [Thu, 16 Mar 2017 01:17:21 +0000 (14:17 +1300)]
avformat/mo: Add experimental demuxing support for Opus in ISO BMFF (MP4).
Based on the draft spec at http://vfrmaniac.fushizen.eu/contents/opus_in_isobmff.html
Signed-off-by: Matthew Gregan <kinetik@flim.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Matthew Gregan [Thu, 16 Mar 2017 01:17:12 +0000 (14:17 +1300)]
avformat/movenc: Add experimental muxing support for Opus in ISO BMFF (MP4).
Based on the draft spec at http://vfrmaniac.fushizen.eu/contents/opus_in_isobmff.html
'-strict -2' is required to create files in this format.
Signed-off-by: Matthew Gregan <kinetik@flim.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 11 Apr 2017 13:08:07 +0000 (15:08 +0200)]
avformat/oggparseogm: Check ff_alloc_extradata() for failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 11 Apr 2017 13:06:21 +0000 (15:06 +0200)]
avformat/oggparseogm: Check available data before reading global header
Fixes use of uninitialized data
Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Tue, 11 Apr 2017 01:37:35 +0000 (03:37 +0200)]
avcodec/tiff: Factor constant computation out of inner loop
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Tue, 11 Apr 2017 15:08:45 +0000 (12:08 -0300)]
avcodec/dnxhddec: fix -Wformat warning raised by DJGPP
FF_ARRAY_ELEMS returns a size_t value.
Reviewed-by: ubitux
Signed-off-by: James Almer <jamrial@gmail.com>
Paul B Mahol [Tue, 11 Apr 2017 15:07:52 +0000 (17:07 +0200)]
avcodec/lcldec: mark output frames as keyframes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Tue, 11 Apr 2017 15:05:01 +0000 (17:05 +0200)]
avcodec/lcldec: add support for frame threads
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Steven Liu [Tue, 11 Apr 2017 04:46:28 +0000 (12:46 +0800)]
doc/APIChages: Add av_strireplace()
Add av_strireplace() into APIChanges
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Steven Liu [Tue, 11 Apr 2017 02:54:35 +0000 (10:54 +0800)]
avutil/avstring: improve av_strreplace implement
Use AVBprint to implement av_strreplace
add av_strreplace test case TEST_STRREPLACE
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Michael Niedermayer [Fri, 7 Apr 2017 11:49:09 +0000 (13:49 +0200)]
avutil/internal: Do not enable CHECKED with DEBUG
This avoids potential undefined behavior in debug mode while still allowing
developers which want to check for potential additional overflows to do so
by manually enabling this.
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Mon, 10 Apr 2017 22:08:39 +0000 (00:08 +0200)]
avcodec/dnxhddec: add support for very big resolutions
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 10 Apr 2017 16:12:33 +0000 (18:12 +0200)]
avfilter: add GRAY10 and GRAY12 to some filters
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 10 Apr 2017 15:34:19 +0000 (17:34 +0200)]
avfilter/vf_alphamerge: add GBRAP support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 10 Apr 2017 15:23:49 +0000 (17:23 +0200)]
avfilter/vf_alphamerge: use av_image_copy_plane()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
James Almer [Mon, 10 Apr 2017 15:17:03 +0000 (12:17 -0300)]
x86/float_dsp: add ff_vector_dmac_scalar_{sse2,avx,fma3}
James Almer [Mon, 10 Apr 2017 15:12:55 +0000 (12:12 -0300)]
avutil/float_dsp: add test for vector_dmac_scalar
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>
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).
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>
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>
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>
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>
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>
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>
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>
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>
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>