OSDN Git Service
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Clément Bœsch [Sat, 8 Apr 2017 12:16:06 +0000 (14:16 +0200)]
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>
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>
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>
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>
James Almer [Sat, 8 Apr 2017 04:12:57 +0000 (01:12 -0300)]
ffmpeg: use av_stream_new_side_data() in init_output_stream
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>
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>
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>