OSDN Git Service
Clément Bœsch [Fri, 5 May 2017 08:37:57 +0000 (10:37 +0200)]
Merge commit '
65074791e8f8397600aacc9801efdd17777eb6e3'
* commit '
65074791e8f8397600aacc9801efdd17777eb6e3':
aarch64: vp9dsp: Fix vertical alignment in the init file
This commit is a noop, see
02cfb9a16e6fdfabea7095c0cf327e8244477ad7
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 5 May 2017 08:37:31 +0000 (10:37 +0200)]
Merge commit '
c536e5e8698110c139b1c17938998a5547550aa3'
* commit '
c536e5e8698110c139b1c17938998a5547550aa3':
arm: vp9mc: Fix vertical alignment of operands
This commit is a noop, see
656d910981b6c9fea6a34dffab37f951a661af44
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 5 May 2017 08:36:48 +0000 (10:36 +0200)]
Merge commit '
d31f46e1999fab31be46f0cbce0546a5aa49fe48'
* commit '
d31f46e1999fab31be46f0cbce0546a5aa49fe48':
cmdutils: update copyright year to 2017
This commit is a noop, see
d800d48fc67208819c2a4ae5eb214ca5e3ad7e82
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 5 May 2017 08:34:54 +0000 (10:34 +0200)]
Merge commit '
ee164727dd64c199b87118917e674b17c25e0da3'
* commit '
ee164727dd64c199b87118917e674b17c25e0da3':
configure: Fix typo in incdir variable written to config.sh
This commit is a noop, see
6fdd35a3126f6ecbe4ebab12bdf8867e4f544958
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 5 May 2017 08:33:02 +0000 (10:33 +0200)]
Merge commit '
eef860dd92538764f4ab7872812914ff10384268'
* commit '
eef860dd92538764f4ab7872812914ff10384268':
fate: Tweak printing of ignored tests
Merged-by: Clément Bœsch <cboesch@gopro.com>
Clément Bœsch [Fri, 5 May 2017 08:32:52 +0000 (10:32 +0200)]
Merge commit '
5c83b4d550ea42653fece092987bab56ccc32ead'
* commit '
5c83b4d550ea42653fece092987bab56ccc32ead':
fate: Unset the sig variable if ignoring a test failure
Merged-by: Clément Bœsch <cboesch@gopro.com>
Carl Eugen Hoyos [Thu, 4 May 2017 23:23:24 +0000 (01:23 +0200)]
lavu/timecode: Increase AV_TIMECODE_STR_SIZE.
Fixes the following warning:
libavutil/timecode.c:103:60: warning: '%02d' directive output may be truncated writing between 2 and 10 bytes into a region of size between 0 and 7
Clément Bœsch [Fri, 5 May 2017 07:19:41 +0000 (09:19 +0200)]
Merge commit '
35d1f726eb9fdd376ab900587fb02122b72f2b9a'
* commit '
35d1f726eb9fdd376ab900587fb02122b72f2b9a':
fate: Add --ignore-tests configure option for omitting specific FATE tests
Merged-by: Clément Bœsch <cboesch@gopro.com>
James Almer [Fri, 5 May 2017 03:16:06 +0000 (00:16 -0300)]
library.mak: fix build rules that depend on pgk-config files
Regression since
6fdd35a312
Michael Niedermayer [Fri, 5 May 2017 01:24:40 +0000 (03:24 +0200)]
avcodec/cavsdec: Fix undefined behavior from integer overflow
Fixes: 1335/clusterfuzz-testcase-minimized-
5566961566089216
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 5 May 2017 00:51:13 +0000 (02:51 +0200)]
avcodec/dvdsubdec: Fix runtime error: left shift of 242 by 24 places cannot be represented in type 'int'
Fixes: 1080/clusterfuzz-testcase-
5353236754071552
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Fri, 5 May 2017 00:49:46 +0000 (21:49 -0300)]
Merge commit '
8a34f3659371680ca523aecfd9098c28f0f809eb'
* commit '
8a34f3659371680ca523aecfd9098c28f0f809eb':
build: Add version numbers to "Requires" entries in pkg-config files
This commit is a noop, see
6fdd35a3126f6ecbe4ebab12bdf8867e4f544958
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 5 May 2017 00:44:58 +0000 (21:44 -0300)]
avcodec/vorbisdec: add missing comma
Should fix compilation failures after
191b2d4fc96fa87975a8eb5d87db04516b8a04c3.
Found-by: philipl
James Almer [Fri, 5 May 2017 00:41:43 +0000 (21:41 -0300)]
Merge commit '
53618054b64ce4dab459d23a7efebe9d5afc4855'
* commit '
53618054b64ce4dab459d23a7efebe9d5afc4855':
parser: Add missing #include for printing ISO C99 conversion specifiers
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 5 May 2017 00:38:00 +0000 (21:38 -0300)]
Merge commit '
0982152c3fb05365597978c5d7cfeeb7ced01723'
* commit '
0982152c3fb05365597978c5d7cfeeb7ced01723':
matroskadec: fix SRT subtitle duration
This commit is a noop.
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 5 May 2017 00:31:34 +0000 (21:31 -0300)]
Merge commit '
131644677970a3c4a0096270ea2a5b5d437c2e63'
* commit '
131644677970a3c4a0096270ea2a5b5d437c2e63':
http: Check for negative chunk sizes
This commit is a noop, see
2a05c8f813de6f2278827734bf8102291e7484aa
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Fri, 5 May 2017 00:19:41 +0000 (21:19 -0300)]
Merge commit '
0b77a5933635293508e7289e7cf191ed166cf070'
* commit '
0b77a5933635293508e7289e7cf191ed166cf070':
Use correct printf conversion specifiers for POSIX integer types
See
549045254c4614d5d61b5c36e340171a6914d57c
Merged-by: James Almer <jamrial@gmail.com>
James Almer [Thu, 4 May 2017 22:59:30 +0000 (19:59 -0300)]
Merge commit '
92db5083077a8b0f8e1050507671b456fd155125'
* commit '
92db5083077a8b0f8e1050507671b456fd155125':
build: Generate pkg-config files from Make and not from configure
build: Store library version numbers in .version files
Includes cherry-picked commits
8a34f3659371680ca523aecfd9098c28f0f809eb and
ee164727dd64c199b87118917e674b17c25e0da3 to fix issues.
Changes were also made to retain support for raise_major and build_suffix.
Reviewed-by: ubitux
Merged-by: James Almer <jamrial@gmail.com>
wm4 [Thu, 4 May 2017 22:15:21 +0000 (00:15 +0200)]
cuvid: support AVCodecContext.hw_device_ctx API
This is a newer API that is intended for decoders like the cuvid
wrapper. Until now, the wrapper required to set an awkward
"incomplete" hw_frames_ctx to set the device. Now the device
can be set directly, and the user can get AV_PIX_FMT_CUDA output
for a specific device simply by setting hw_device_ctx.
This still does a dummy ff_get_format() call at init time, and should
be fully backward compatible.
wm4 [Thu, 4 May 2017 22:15:15 +0000 (00:15 +0200)]
ffmpeg: check for unconnected outputs
Fixes e.g.:
ffmpeg -f lavfi -i testsrc -f lavfi -i testsrc -filter_complex "[0:v][1:v]psnr[out]" -f null none
Carl Eugen Hoyos [Mon, 1 May 2017 08:49:31 +0000 (10:49 +0200)]
compat/strtod: Add missing const qualifiers.
Fixes many warnings:
initialization discards 'const' qualifier from pointer target type
Michael Niedermayer [Thu, 27 Apr 2017 13:10:25 +0000 (15:10 +0200)]
avcodec/mjpegdec: Fix runtime error: signed integer overflow: -24543 *
2031616 cannot be represented in type 'int'
Fixes: 943/clusterfuzz-testcase-
5114865297391616
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 7 Apr 2017 01:38:12 +0000 (03:38 +0200)]
avcodec/wavpack: Fix invalid shift and integer overflow
Fixes: 940/clusterfuzz-testcase-
5200378381467648
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 1 May 2017 20:54:15 +0000 (22:54 +0200)]
avcodec/flicvideo: Check for chunk overread
Fixes integer overflow
Fixes: 1292/clusterfuzz-testcase-minimized-
5795512143839232
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Wed, 3 May 2017 03:21:51 +0000 (05:21 +0200)]
libavcodec/mpeg4videodec: Convert sprite_offset to 64bit
This avoids intermediates from overflowing (the final values are checked)
Fixes: runtime error: signed integer overflow: -167712 + -
2147352576 cannot be represented in type 'int'
Fixes: 1298/clusterfuzz-testcase-minimized-
5955580877340672
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 4 May 2017 16:40:46 +0000 (18:40 +0200)]
avcodec/pngdec: Use ff_set_dimensions()
Fixes OOM
Fixes: 1314/clusterfuzz-testcase-minimized-
4621997222920192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 4 May 2017 13:24:46 +0000 (15:24 +0200)]
avcodec/msvideo1: Check buffer size before re-getting the frame
Fixes timeout
Fixes: 1306/clusterfuzz-testcase-minimized-
6152296217968640
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 4 May 2017 11:56:40 +0000 (13:56 +0200)]
configure: Do not add omit-frame-pointer for ossfuzz
ossfuzz works better without it
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 4 May 2017 11:31:02 +0000 (13:31 +0200)]
tools/target_dec_fuzzer: Fix memleak on open failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Thu, 4 May 2017 03:26:13 +0000 (00:26 -0300)]
configure: fix libopus detection
Prevents compilation failures on libopus < 1.0.3
Regression since
37941878.
James Almer [Wed, 26 Apr 2017 03:36:17 +0000 (00:36 -0300)]
avformat/concatdec: port to the new bitstream filter API
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Wed, 3 May 2017 14:36:39 +0000 (16:36 +0200)]
tools/target_dec_fuzzer: Use decoder and not codec_id as argument
This allows fuzzing decoders with the same codec_id
We also avoid register all to allow the linker to prune unused sections and symbols
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Clément Bœsch [Wed, 3 May 2017 10:51:48 +0000 (12:51 +0200)]
Merge commit '
11a9320de54759340531177c9f2b1e31e6112cc2'
* commit '
11a9320de54759340531177c9f2b1e31e6112cc2':
build: Move build-system-related helper files to a separate subdirectory
"ffbuild" directory name is used instead of "avbuild".
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 3 May 2017 10:28:54 +0000 (12:28 +0200)]
Merge commit '
f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa'
* commit '
f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa':
ratecontrol: Drop xvid-rc-related struct members unused after
a6901b9c6
This commit is a noop, see
99b35a51ccbe2fc98530e5cf7529e7d377e1165e
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 3 May 2017 10:28:20 +0000 (12:28 +0200)]
Merge commit '
5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b'
* commit '
5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b':
nvenc: Update check for lookahead
This commit is a noop, see
67db4ff3b66e96a20ddf1c264d07e146334ae88e
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 3 May 2017 10:26:53 +0000 (12:26 +0200)]
Merge commit '
a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2'
* commit '
a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2':
aarch64: vp9itxfm: Use the offset parameter to movrel
This commit is a noop, see
8b11a89c06b94632d545f67ca508bd9c05c435ac
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 3 May 2017 10:25:43 +0000 (12:25 +0200)]
Merge commit '
fc322d6a70189da24dbd445c710bb214eb031ce7'
* commit '
fc322d6a70189da24dbd445c710bb214eb031ce7':
tta: Convert to the new bitstream reader
mlp: Convert to the new bitstream reader
unary: 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 [Wed, 3 May 2017 10:24:41 +0000 (12:24 +0200)]
Merge commit '
45286a625c6ced1f5c4c842244cbb4509429abba'
* commit '
45286a625c6ced1f5c4c842244cbb4509429abba':
h264dec: make sure to only end a field if it has been started
This commit is a noop. Our h264 slicing handling is different and does
not seem to be affected by the issue.
Merged-by: Clément Bœsch <u@pkh.me>
Michael Niedermayer [Thu, 27 Apr 2017 13:10:26 +0000 (15:10 +0200)]
avcodec/svq3: Reject dx/dy beyond 16bit
The code does use 16bit sized arrays later so larger deltas would not work
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 27 Apr 2017 13:10:25 +0000 (15:10 +0200)]
avcodec/svq3: Increase offsets to prevent integer overflows
Fixes: 1280/clusterfuzz-testcase-minimized-
6102353767825408
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Tue, 2 May 2017 14:09:11 +0000 (16:09 +0200)]
lavc/jpeg2000dec: Fix jp2 inner atom size used for overread checks.
James Almer [Mon, 1 May 2017 23:01:22 +0000 (20:01 -0300)]
avcodec/decode: also check for FF_CODEC_CAP_SETS_PKT_DTS in audio decoders
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Tue, 2 May 2017 01:56:13 +0000 (03:56 +0200)]
avutil/softfloat: use ldexp(), fixes undefined shift
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Muhammad Faiz [Tue, 2 May 2017 00:22:31 +0000 (07:22 +0700)]
ffmpeg: count packets when queued
Because write_packet() fakely writes packets to muxer by queueing
them when muxer hasn't been initialized, it should also increment
frame_number fakely.
This is required because code in do_streamcopy() rely on
frame_number.
Should fix Ticket6227
Reviewed-by: James Almer <jamrial@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Muhammad Faiz [Mon, 1 May 2017 00:34:25 +0000 (07:34 +0700)]
avcodec/decode: do not treat discarded frames as eof when draining
Fix fate failures:
make fate-mov THREADS=32
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Thomas Mundt [Thu, 20 Apr 2017 21:33:39 +0000 (23:33 +0200)]
avfilter/interlace: add complex vertical low-pass filter
This complex (-1 2 6 2 -1) filter slightly less reduces interlace 'twitter' but better retain detail and subjective sharpness impression compared to the linear (1 2 1) filter.
Signed-off-by: Thomas Mundt <tmundt75@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Carl Eugen Hoyos [Tue, 2 May 2017 06:43:12 +0000 (08:43 +0200)]
lavf/nutdec: Fix an impossible condition, regression since
e0c53c34.
Fixes ticket #6362.
James Almer [Mon, 1 May 2017 23:37:41 +0000 (20:37 -0300)]
avcodec/internal: update FF_CODEC_CAP_SETS_PKT_DTS doxy
The code it refers to was moved to decode.c in
00fb745a10a151791ce2e49ba3e463bd17ea9251
Michael Niedermayer [Mon, 1 May 2017 22:28:39 +0000 (00:28 +0200)]
tools/target_dec_fuzzer: Use avcodec_register_all() instead of register_all()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Carl Eugen Hoyos [Mon, 1 May 2017 08:35:28 +0000 (10:35 +0200)]
lavc/mips/iirfilter_mips: Include config.h.
Fixes the following warning:
libavcodec/mips/iirfilter_mips.c:57:5: warning: "HAVE_INLINE_ASM" is not defined
Carl Eugen Hoyos [Mon, 1 May 2017 08:31:35 +0000 (10:31 +0200)]
lavc/mips/hevc_idct_msa: Add missing const qualifier.
Fixes many warnings:
initialization discards 'const' qualifier from pointer target type
Michael Niedermayer [Mon, 1 May 2017 16:53:52 +0000 (18:53 +0200)]
avcodec/indeo2: Check remaining bits in ir2_decode_plane()
Fixes: 1290/clusterfuzz-testcase-minimized-
5815578902134784
Fixes: timeout
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 1 May 2017 16:46:27 +0000 (18:46 +0200)]
avcodec/vp3: Check remaining bits in unpack_dct_coeffs()
Decreases the time spend decoding junk.
May fix: 1283/clusterfuzz-testcase-minimized-
6221126759874560
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Fri, 28 Apr 2017 00:50:42 +0000 (02:50 +0200)]
doc/developer: Add terse documentation of assumed C implementation defined behavior
Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Mon, 1 May 2017 15:53:11 +0000 (17:53 +0200)]
avcodec/bmp: Use ff_set_dimensions()
Fixes out of memory
Fixes: 1282/clusterfuzz-testcase-minimized-
5400131681648640
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Micah Galizia [Sun, 30 Apr 2017 18:25:29 +0000 (14:25 -0400)]
libavformat/http: Ignore expired cookies
Signed-off-by: Micah Galizia <micahgalizia@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Vignali [Sun, 23 Apr 2017 15:49:05 +0000 (17:49 +0200)]
fate/exr : add test for negative float value
the tested sample contain negative value in the red channel
need to be clip to zero, and not set to MAX_RED
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Vignali [Sun, 23 Apr 2017 13:15:31 +0000 (15:15 +0200)]
fate/exr : add tests for piz uncompress
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Vignali [Sun, 23 Apr 2017 13:38:14 +0000 (15:38 +0200)]
libavcodec/exr : fix piz uncompress on big endian
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Almer [Mon, 24 Apr 2017 17:53:47 +0000 (14:53 -0300)]
avcodec/options: do a more thorough clean up in avcodec_copy_context()
Free coded_frame, coded_side_data and unref hw_device_ctx to prevent
potential leaks.
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sat, 22 Apr 2017 16:25:32 +0000 (13:25 -0300)]
avcodec/options: factorize avcodec_copy_context() cleanup code
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 25 Apr 2017 18:42:51 +0000 (15:42 -0300)]
avformat/matroskaenc: add support for writing Content Light Level elements
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Tue, 25 Apr 2017 18:04:00 +0000 (15:04 -0300)]
avformat/matroskadec: export Content Light Level metadata
Based on a patch by Hendrik Leppkes
Signed-off-by: James Almer <jamrial@gmail.com>
James Almer [Sun, 30 Apr 2017 13:23:50 +0000 (10:23 -0300)]
Merge commit '
c2fa6bb0e8703a7a6aa10e11f9ab36094416d83f'
* commit '
c2fa6bb0e8703a7a6aa10e11f9ab36094416d83f':
mpeg12dec: move setting first_field to mpeg_field_start()
This commit is a noop, see
2f6f2f4f73c068979829e785d08cb1dd345c7fc8
Merged-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sun, 30 Apr 2017 09:44:51 +0000 (11:44 +0200)]
tools: Eliminate codec_type complexity from fuzzer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Sat, 29 Apr 2017 16:46:48 +0000 (18:46 +0200)]
libswscale/tests/swscale: Fix uninitialized variables
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Paul B Mahol [Sun, 30 Apr 2017 10:56:23 +0000 (12:56 +0200)]
avfilter/af_crystalizer: add support for more sample formats
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Muhammad Faiz [Fri, 28 Apr 2017 10:19:13 +0000 (17:19 +0700)]
avcodec/pthread_frame, decode: allow errors to happen on draining
So, all frames and errors are correctly reported in order.
Also limit the numbers of error during draining to prevent infinite loop.
This fix fate failure with THREADS>=4:
make fate-h264-attachment-631 THREADS=4
This also reverts
a755b725ec1d657609c8bd726ce37e7cf193d03f.
Suggested-by: wm4, Ronald S. Bultje, Marton Balint
Reviewed-by: w4 <nfxjfg@googlemail.com>
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Paul B Mahol [Tue, 25 Apr 2017 17:31:05 +0000 (19:31 +0200)]
avfilter: add video oscilloscope filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 22 Apr 2017 20:02:49 +0000 (22:02 +0200)]
avfilter: add pixscope filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Sat, 29 Apr 2017 11:49:06 +0000 (13:49 +0200)]
Merge commit '
e807491fc6a336e4becc0cbc981274a8fde18aba'
* commit '
e807491fc6a336e4becc0cbc981274a8fde18aba':
mpeg12dec: avoid signed overflow in bitrate calculation
mpegvideo_parser: avoid signed overflow in bitrate calculation
This merge is a noop.
2017-04-29 12:54:15 @ubitux michaelni: is
740959fdbfbf804ccd8a6e426b1b1ba321fe5cfb enough to fix the overflow fixed in
58405de0951a843765625159402870c1eea3c3b1?
2017-04-29 12:55:53 @ubitux same question with
e807491fc6a336e4becc0cbc981274a8fde18aba
2017-04-29 13:21:45 michaelni ubitux, the libav code refered to is wrong for us and i doubt the problem it fixes applies to us.
2017-04-29 13:24:29 @ubitux michaelni: ok, for both commits?
2017-04-29 13:33:55 michaelni yes, they do more or less the same thing
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sat, 29 Apr 2017 10:46:48 +0000 (12:46 +0200)]
Merge commit '
46191a2da16f751e53d93646ae1388d421d12bee'
* commit '
46191a2da16f751e53d93646ae1388d421d12bee':
mov: fix a possible invalid read in mov_read_mac_string()
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sat, 29 Apr 2017 10:46:00 +0000 (12:46 +0200)]
Merge commit '
cfa4eb4fba782f3f37a33be997b27a91a07053c9'
* commit '
cfa4eb4fba782f3f37a33be997b27a91a07053c9':
vaapi_decode: use the correct logging context
This commit is a noop, see
79307ae56374b35cf12563a7c8e3e759658f847e
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sat, 29 Apr 2017 10:45:21 +0000 (12:45 +0200)]
Merge commit '
ea8b730d8e67152107d7fcdd5590bbb51ec236b1'
* commit '
ea8b730d8e67152107d7fcdd5590bbb51ec236b1':
hevcdec: add a VAAPI hwaccel
This commit is a noop, see
adb54e59c18db347f39e55832104fc3e40a3c42b
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Sat, 29 Apr 2017 10:43:37 +0000 (12:43 +0200)]
Merge commit '
1783d7ec03d730c5bd96c07bc5fa7aa566f85c66'
* commit '
1783d7ec03d730c5bd96c07bc5fa7aa566f85c66':
Changelog: add some missing entries
Merged-by: Clément Bœsch <u@pkh.me>
Paul B Mahol [Sat, 29 Apr 2017 09:44:21 +0000 (11:44 +0200)]
doc/filters: add one lowpass filter example
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Lucas Cooper [Thu, 27 Apr 2017 22:08:29 +0000 (15:08 -0700)]
avformat/movenc: Explicitly address potential division by zero.
find_fps attempts to infer framerate from AVCodec's timebase. When this
results in a frame rate that isn't explicitly marked as supported in
av_timecode_check_frame_rate, find_fps returns the AVStream's
avg_frame_rate, which, per avformat.h, _may_ be set (or not).
mov_get_mpeg2_xdcam_codec_tag, mov_get_h264_codec_tag and
find_compressor attempt to call av_q2d on the return value of find_fps,
which in the above case, may result in division by zero and therefore,
an undefined frame rate when NaN is converted to int.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
James Zern [Fri, 14 Apr 2017 01:26:44 +0000 (18:26 -0700)]
libvpxenc: allow aq-mode 4 (equator360)
this was added in 1.6.0
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Zern <jzern@google.com>
Muhammad Faiz [Tue, 25 Apr 2017 07:33:24 +0000 (14:33 +0700)]
avfilter/lavfutils: use image2pipe demuxer on ff_load_image
allow protocols other than file to be used
for example, use data protocol to embed a file in script
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
Steven Liu [Fri, 28 Apr 2017 02:18:44 +0000 (10:18 +0800)]
avformat/hlsenc: fix CID
1405135
Fixes Coverity CID:
1405135
Reviewed-by: Rodger Combs <rodger.combs@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Steven Liu [Fri, 28 Apr 2017 02:17:40 +0000 (10:17 +0800)]
avformat/hlsenc: hold old key info when append list
fix ticket id: #6353
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
Rostislav Pehlivanov [Thu, 27 Apr 2017 04:50:39 +0000 (05:50 +0100)]
opus_pvq: use function pointers for recursion
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
James Almer [Thu, 27 Apr 2017 03:33:24 +0000 (00:33 -0300)]
avcodec/opus_pvq: fix recursive inlining compilation failures
They were introduced by
f16180f44859587e0211170bd82b1bfd26f24b5a
Michael Niedermayer [Thu, 27 Apr 2017 00:27:16 +0000 (02:27 +0200)]
avcodec/mdec: Fix runtime error: left shift of negative value -127
Fixes undefined behavior
Fixes: 1275/clusterfuzz-testcase-minimized-
6718162017976320
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 27 Apr 2017 00:18:03 +0000 (02:18 +0200)]
tools/target_dec_fuzzer: Fix return code on open failure
Fixes: 1271/clusterfuzz-testcase-minimized-
6095220498235392
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Michael Niedermayer [Thu, 27 Apr 2017 00:08:54 +0000 (02:08 +0200)]
avcodec/x86/vc1dsp_init: Fix build failure with --disable-optimizations and clang
compilers doing DCE at -O0 do not necessarily understand "complex" boolean expressions
Build succeeds with this change, this was the only failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Martin Vignali [Tue, 25 Apr 2017 20:52:50 +0000 (22:52 +0200)]
libavcodec/exr : fix float to uint16 conversion for negative float value
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Rostislav Pehlivanov [Thu, 27 Apr 2017 01:15:36 +0000 (02:15 +0100)]
opus_pvq: merge band encoding and decoding into one function
Most code between the 2 functions was duplicated which made keeping
both in sync difficult.
This also fixes some discovered issues with encoding (incorrect
TF switching buffers) and reduces stack usage (reuse the already
allocated CeltFrame->scratch buffer for the quantized coefficients).
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Wed, 26 Apr 2017 22:28:16 +0000 (23:28 +0100)]
opus_pvq: remove outdated/incorrect comments and redundant variables
Removes the last style issues with opus_pvq.c
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Rostislav Pehlivanov [Thu, 20 Apr 2017 19:00:25 +0000 (20:00 +0100)]
opus_pvq: minor cleanups
Removes unneeded variables, renames confusing and innacurate variables
and rewrites and slightly optimizes hadamard interleave/deinterleave
functions.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Ben Chang [Tue, 25 Apr 2017 21:57:56 +0000 (14:57 -0700)]
avcodec/nvenc: surface allocation reduction
This patch aims to reduce the number of input/output surfaces
NVENC allocates per session. Previous default sets allocated surfaces to 32
(unless there is user specified param or lookahead involved). Having large
number of surfaces consumes extra video memory (esp for higher resolution
encoding). The patch changes the surfaces calculation for default, B-frames,
lookahead scenario respectively.
The other change involves surface selection. Previously, if a session
allocates x surfaces, only x-1 surfaces are used (due to combination
of output delay and lock toggle logic). To prevent unused surfaces,
changing surface rotation to using predefined fifo.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
Clément Bœsch [Wed, 26 Apr 2017 15:35:28 +0000 (17:35 +0200)]
lavc/hevcdec: fix invalid use of ff_get_format()
Regression since
76cc100afba25308eaa909acd8804cc0b42057f6.
Spotted-by: James Almer <jamrial@gmail.com>
Clément Bœsch [Wed, 26 Apr 2017 15:32:40 +0000 (17:32 +0200)]
Merge commit '
d4a91e65343be5d79a4afa61c791191e1b57499a'
* commit '
d4a91e65343be5d79a4afa61c791191e1b57499a':
pthread_frame: do not run hwaccel decoding asynchronously unless it's safe
This commit is a noop, see
e0cd598bc4684654d63942e9ff4872c0b48a7dc2
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 26 Apr 2017 15:31:22 +0000 (17:31 +0200)]
Merge commit '
8dfba25ce89b62c80ba83e2116d549176c376144'
* commit '
8dfba25ce89b62c80ba83e2116d549176c376144':
pthread_frame: ensure the threads don't run simultaneously with hwaccel
This commit is a noop, see
14bb15bfd56d6e907fabe4620206c1ee152b7a20
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 26 Apr 2017 15:25:54 +0000 (17:25 +0200)]
Merge commit '
373fd76b4dbd9aa03ed28e502f33f2ca8c1ce19a'
* commit '
373fd76b4dbd9aa03ed28e502f33f2ca8c1ce19a':
hevcdec: do not set decoder-global SPS prematurely
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 26 Apr 2017 15:17:50 +0000 (17:17 +0200)]
Merge commit '
0fea8555ae25124c21f4c4f55a5fa76e9169aa03'
* commit '
0fea8555ae25124c21f4c4f55a5fa76e9169aa03':
v4l2: use codec descriptors for mapping a codec name to id
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 26 Apr 2017 14:57:11 +0000 (16:57 +0200)]
Merge commit '
ee480790c7eeb03c9cebd8971c46e0cb7db65277'
* commit '
ee480790c7eeb03c9cebd8971c46e0cb7db65277':
build: Add name parameter to check_lib() helper function
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 26 Apr 2017 14:42:17 +0000 (16:42 +0200)]
Merge commit '
1faffe7e8fab21186a233011bc8a62f47962e2cd'
* commit '
1faffe7e8fab21186a233011bc8a62f47962e2cd':
configure: Disentangle vfw32 and user32 lib handling
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 26 Apr 2017 14:39:37 +0000 (16:39 +0200)]
Merge commit '
f7174d7ed045445d00a6d557236737d09ad32343'
* commit '
f7174d7ed045445d00a6d557236737d09ad32343':
configure: fix linking with MSVC when using --disable-optimizations
Merged-by: Clément Bœsch <u@pkh.me>
Clément Bœsch [Wed, 26 Apr 2017 14:38:10 +0000 (16:38 +0200)]
Merge commit '
ef9a711be718ed3802a263d1d9ed340a4aaef224'
* commit '
ef9a711be718ed3802a263d1d9ed340a4aaef224':
configure: put d3d11 check in alphabetical order
Merged-by: Clément Bœsch <u@pkh.me>