1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

86386 Commits

Author SHA1 Message Date
Clément Bœsch
d168fe14e9 Merge commit '0ac2d86c4758e1419934905b6c092910296aa16a'
* commit '0ac2d86c4758e1419934905b6c092910296aa16a':
  dxva2: Factorize DXVA context validity test into a single macro

This commit is (mostly) a noop, see 77742c75c5

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:56:21 +02:00
Clément Bœsch
055d6c2ea9 Merge commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a'
* commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a':
  dxva2: Make ff_dxva2_get_surface() static and drop its name prefix

This commit is a noop, see fd0716b364

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:48:36 +02:00
Clément Bœsch
e6ee42febb Merge commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b'
* commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b':
  matroskadec: make sure not to leave EbmlBin in an inconsistent state

This commit is a noop, see 5e1bacf2d4

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:46:24 +02:00
Clément Bœsch
730f75a099 Merge commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20'
* commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20':
  vaapi_h264: Fix POC on IDR frames

This commit is a noop, see e72662e131

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:40:42 +02:00
Clément Bœsch
7b1929f173 Merge commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552'
* commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552':
  vaapi_h265: Fix build failure with old libva without 10-bit surfaces

This commit is a noop, see b9514756ba

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:39:18 +02:00
Clément Bœsch
31fc675b1c Merge commit '85ad5ea72ce3983947a3b07e4b35c66cb16dfaba'
* commit '85ad5ea72ce3983947a3b07e4b35c66cb16dfaba':
  aarch64: vp9mc: Fix a comment to refer to a register with the right name

This commit is a noop, see 0ba0187535

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:38:14 +02:00
Clément Bœsch
f439764657 Merge commit '65074791e8f8397600aacc9801efdd17777eb6e3'
* commit '65074791e8f8397600aacc9801efdd17777eb6e3':
  aarch64: vp9dsp: Fix vertical alignment in the init file

This commit is a noop, see 02cfb9a16e

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:37:57 +02:00
Clément Bœsch
7d79d58a4e Merge commit 'c536e5e8698110c139b1c17938998a5547550aa3'
* commit 'c536e5e8698110c139b1c17938998a5547550aa3':
  arm: vp9mc: Fix vertical alignment of operands

This commit is a noop, see 656d910981

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:37:31 +02:00
Clément Bœsch
21f17bbfd4 Merge commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48'
* commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48':
  cmdutils: update copyright year to 2017

This commit is a noop, see d800d48fc6

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:36:48 +02:00
Clément Bœsch
3757f8f2f6 Merge commit 'ee164727dd64c199b87118917e674b17c25e0da3'
* commit 'ee164727dd64c199b87118917e674b17c25e0da3':
  configure: Fix typo in incdir variable written to config.sh

This commit is a noop, see 6fdd35a312

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:34:54 +02:00
Clément Bœsch
8a8f77e49b Merge commit 'eef860dd92538764f4ab7872812914ff10384268'
* commit 'eef860dd92538764f4ab7872812914ff10384268':
  fate: Tweak printing of ignored tests

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:33:02 +02:00
Clément Bœsch
ed1fe7b2fe Merge commit '5c83b4d550ea42653fece092987bab56ccc32ead'
* commit '5c83b4d550ea42653fece092987bab56ccc32ead':
  fate: Unset the sig variable if ignoring a test failure

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-05-05 10:32:52 +02:00
Carl Eugen Hoyos
ae68bb779c 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
2017-05-05 10:09:12 +02:00
Clément Bœsch
f5218b27c4 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>
2017-05-05 09:27:18 +02:00
James Almer
a5fdda79ee library.mak: fix build rules that depend on pgk-config files
Regression since 6fdd35a312
2017-05-05 00:50:20 -03:00
Michael Niedermayer
a0e5f7f363 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>
2017-05-05 04:25:07 +02:00
Michael Niedermayer
ce7098b8f2 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>
2017-05-05 04:25:07 +02:00
James Almer
ea49308402 Merge commit '8a34f3659371680ca523aecfd9098c28f0f809eb'
* commit '8a34f3659371680ca523aecfd9098c28f0f809eb':
  build: Add version numbers to "Requires" entries in pkg-config files

This commit is a noop, see 6fdd35a312

Merged-by: James Almer <jamrial@gmail.com>
2017-05-04 21:49:46 -03:00
James Almer
8acd73e348 avcodec/vorbisdec: add missing comma
Should fix compilation failures after 191b2d4fc9.

Found-by: philipl
2017-05-04 21:44:58 -03:00
James Almer
fb496921e8 Merge commit '53618054b64ce4dab459d23a7efebe9d5afc4855'
* commit '53618054b64ce4dab459d23a7efebe9d5afc4855':
  parser: Add missing #include for printing ISO C99 conversion specifiers

Merged-by: James Almer <jamrial@gmail.com>
2017-05-04 21:41:43 -03:00
James Almer
43b136ce80 Merge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'
* commit '0982152c3fb05365597978c5d7cfeeb7ced01723':
  matroskadec: fix SRT subtitle duration

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-05-04 21:38:00 -03:00
James Almer
f31f610f33 Merge commit '131644677970a3c4a0096270ea2a5b5d437c2e63'
* commit '131644677970a3c4a0096270ea2a5b5d437c2e63':
  http: Check for negative chunk sizes

This commit is a noop, see 2a05c8f813

Merged-by: James Almer <jamrial@gmail.com>
2017-05-04 21:31:34 -03:00
James Almer
191b2d4fc9 Merge commit '0b77a5933635293508e7289e7cf191ed166cf070'
* commit '0b77a5933635293508e7289e7cf191ed166cf070':
  Use correct printf conversion specifiers for POSIX integer types

See 549045254c

Merged-by: James Almer <jamrial@gmail.com>
2017-05-04 21:21:16 -03:00
James Almer
6fdd35a312 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 8a34f36593 and
ee164727dd 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>
2017-05-04 19:59:30 -03:00
wm4
c0f17a905f 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.
2017-05-05 00:17:41 +02:00
wm4
974ee16d6a 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
2017-05-05 00:15:15 +02:00
Carl Eugen Hoyos
3624d45ddb compat/strtod: Add missing const qualifiers.
Fixes many warnings:
initialization discards 'const' qualifier from pointer target type
2017-05-04 23:17:20 +02:00
Michael Niedermayer
a78ae465fd 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>
2017-05-04 20:42:54 +02:00
Michael Niedermayer
fc4f88375b 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>
2017-05-04 20:32:11 +02:00
Michael Niedermayer
d2657d225c avcodec/flicvideo: Check for chunk overread
Fixes integer overflow
Fixes: 1292/clusterfuzz-testcase-minimized-5795512143839232

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-04 19:52:23 +02:00
Michael Niedermayer
c1c3a14073 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>
2017-05-04 19:49:45 +02:00
Michael Niedermayer
a0296fc056 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>
2017-05-04 18:41:30 +02:00
Michael Niedermayer
cabfed6895 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>
2017-05-04 17:15:43 +02:00
Michael Niedermayer
92f4a4bf29 configure: Do not add omit-frame-pointer for ossfuzz
ossfuzz works better without it

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-04 14:31:20 +02:00
Michael Niedermayer
390c6ee42c tools/target_dec_fuzzer: Fix memleak on open failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-04 13:51:50 +02:00
James Almer
c53bf8c9b8 configure: fix libopus detection
Prevents compilation failures on libopus < 1.0.3
Regression since 37941878.
2017-05-04 00:26:13 -03:00
James Almer
14e092448f 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>
2017-05-03 19:59:49 -03:00
Michael Niedermayer
dec2fa8cc7 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>
2017-05-03 17:22:13 +02:00
Clément Bœsch
3f17751eeb 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>
2017-05-03 16:49:12 +02:00
Clément Bœsch
c3e0854410 Merge commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa'
* commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa':
  ratecontrol: Drop xvid-rc-related struct members unused after a6901b9c6

This commit is a noop, see 99b35a51cc

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-03 12:28:54 +02:00
Clément Bœsch
bf0fde84d5 Merge commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b'
* commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b':
  nvenc: Update check for lookahead

This commit is a noop, see 67db4ff3b6

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-03 12:28:20 +02:00
Clément Bœsch
9f1bca4e6f Merge commit 'a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2'
* commit 'a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2':
  aarch64: vp9itxfm: Use the offset parameter to movrel

This commit is a noop, see 8b11a89c06

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-03 12:26:53 +02:00
Clément Bœsch
9d45454cd0 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>
2017-05-03 12:26:20 +02:00
Clément Bœsch
2584656106 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>
2017-05-03 12:24:41 +02:00
Michael Niedermayer
48b3117844 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>
2017-05-03 11:57:34 +02:00
Michael Niedermayer
382b4fc9b5 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>
2017-05-03 11:57:34 +02:00
Carl Eugen Hoyos
a75ef1506a lavc/jpeg2000dec: Fix jp2 inner atom size used for overread checks. 2017-05-03 03:45:33 +02:00
James Almer
b3570f0389 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>
2017-05-02 20:47:33 -03:00
Michael Niedermayer
79aa2ff199 avutil/softfloat: use ldexp(), fixes undefined shift
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-02 22:55:44 +02:00
Muhammad Faiz
c4be288fdb 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>
2017-05-03 01:47:32 +07:00