ffmpeg.git
2 years agoMerge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'
Clément Bœsch [Fri, 5 May 2017 09:33:17 +0000 (11:33 +0200)]
Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'

* commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed':
  h264dec: make ff_h264_decode_init() static

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851'
Clément Bœsch [Fri, 5 May 2017 09:32:32 +0000 (11:32 +0200)]
Merge commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851'

* commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851':
  h264dec: drop a redundant check

This commit is a noop, see 4cc1ce4a91788a71670ea43fa0026b5a969e9e9e

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '3cba1ad76d362c994fa98fb686e04e20826fb579'
Clément Bœsch [Fri, 5 May 2017 09:31:01 +0000 (11:31 +0200)]
Merge commit '3cba1ad76d362c994fa98fb686e04e20826fb579'

* commit '3cba1ad76d362c994fa98fb686e04e20826fb579':
  x86inc: Avoid using eax/rax for storing the stack pointer

This commit is a noop, see cd09e3b34903db7b7e37fdb4d3e10549bf8b2e82

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'e199a8099411d0992c3ed278287a81f1d791199c'
Clément Bœsch [Fri, 5 May 2017 09:29:21 +0000 (11:29 +0200)]
Merge commit 'e199a8099411d0992c3ed278287a81f1d791199c'

* commit 'e199a8099411d0992c3ed278287a81f1d791199c':
  Changelog: mention the new avbuild/ directory

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f'
Clément Bœsch [Fri, 5 May 2017 09:27:18 +0000 (11:27 +0200)]
Merge commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f'

* commit '4e62b57ee03928c12a3119dcaf78ffa1f4d6985f':
  fate: Skip the checkasm test if CONFIG_STATIC is disabled

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428'
Clément Bœsch [Fri, 5 May 2017 09:26:39 +0000 (11:26 +0200)]
Merge commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428'

* commit '2835e9a9fd2b355e7936d1024ff1bf5fe454e428':
  hevcdec: add P010 support for D3D11VA

This commit is a noop, see ccb94789e2968329947f1c2e00d019f387f9c409

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '0ac2d86c4758e1419934905b6c092910296aa16a'
Clément Bœsch [Fri, 5 May 2017 08:51:09 +0000 (10:51 +0200)]
Merge commit '0ac2d86c4758e1419934905b6c092910296aa16a'

* commit '0ac2d86c4758e1419934905b6c092910296aa16a':
  dxva2: Factorize DXVA context validity test into a single macro

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

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a'
Clément Bœsch [Fri, 5 May 2017 08:48:36 +0000 (10:48 +0200)]
Merge commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a'

* commit 'f8a42d4f260db3eae4399fa8bd8c8c2c1d38f23a':
  dxva2: Make ff_dxva2_get_surface() static and drop its name prefix

This commit is a noop, see fd0716b364f83257caab723e2bb7c65483cb2073

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b'
Clément Bœsch [Fri, 5 May 2017 08:46:24 +0000 (10:46 +0200)]
Merge commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b'

* commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b':
  matroskadec: make sure not to leave EbmlBin in an inconsistent state

This commit is a noop, see 5e1bacf2d49622f7ba4245f140b7be35972c0529

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20'
Clément Bœsch [Fri, 5 May 2017 08:40:42 +0000 (10:40 +0200)]
Merge commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20'

* commit '9b1db2d33883c6ff3f8c7b2453146501ba14ca20':
  vaapi_h264: Fix POC on IDR frames

This commit is a noop, see e72662e131e5099e34d5a7519c5690d2fff7b83f

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552'
Clément Bœsch [Fri, 5 May 2017 08:39:18 +0000 (10:39 +0200)]
Merge commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552'

* commit 'd08e02d929ff8be5f56bb1da0e439bf1ae557552':
  vaapi_h265: Fix build failure with old libva without 10-bit surfaces

This commit is a noop, see b9514756ba2b4f764fb86500a8172a57acb58403

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '85ad5ea72ce3983947a3b07e4b35c66cb16dfaba'
Clément Bœsch [Fri, 5 May 2017 08:38:14 +0000 (10:38 +0200)]
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 0ba0187535498b34d23aa73196f0ed2414dfa15c

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '65074791e8f8397600aacc9801efdd17777eb6e3'
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>
2 years agoMerge commit 'c536e5e8698110c139b1c17938998a5547550aa3'
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>
2 years agoMerge commit 'd31f46e1999fab31be46f0cbce0546a5aa49fe48'
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>
2 years agoMerge commit 'ee164727dd64c199b87118917e674b17c25e0da3'
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>
2 years agoMerge commit 'eef860dd92538764f4ab7872812914ff10384268'
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>
2 years agoMerge commit '5c83b4d550ea42653fece092987bab56ccc32ead'
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>
2 years agolavu/timecode: Increase AV_TIMECODE_STR_SIZE.
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

2 years agoMerge commit '35d1f726eb9fdd376ab900587fb02122b72f2b9a'
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>
2 years agolibrary.mak: fix build rules that depend on pgk-config files
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

2 years agoavcodec/cavsdec: Fix undefined behavior from integer overflow
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>
2 years agoavcodec/dvdsubdec: Fix runtime error: left shift of 242 by 24 places cannot be repres...
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>
2 years agoMerge commit '8a34f3659371680ca523aecfd9098c28f0f809eb'
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>
2 years agoavcodec/vorbisdec: add missing comma
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
2 years agoMerge commit '53618054b64ce4dab459d23a7efebe9d5afc4855'
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>
2 years agoMerge commit '0982152c3fb05365597978c5d7cfeeb7ced01723'
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>
2 years agoMerge commit '131644677970a3c4a0096270ea2a5b5d437c2e63'
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>
2 years agoMerge commit '0b77a5933635293508e7289e7cf191ed166cf070'
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>
2 years agoMerge commit '92db5083077a8b0f8e1050507671b456fd155125'
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>
2 years agocuvid: support AVCodecContext.hw_device_ctx API
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.

2 years agoffmpeg: check for unconnected outputs
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

2 years agocompat/strtod: Add missing const qualifiers.
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

2 years agoavcodec/mjpegdec: Fix runtime error: signed integer overflow: -24543 * 2031616 cannot...
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>
2 years agoavcodec/wavpack: Fix invalid shift and integer overflow
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>
2 years agoavcodec/flicvideo: Check for chunk overread
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>
2 years agolibavcodec/mpeg4videodec: Convert sprite_offset to 64bit
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>
2 years agoavcodec/pngdec: Use ff_set_dimensions()
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>
2 years agoavcodec/msvideo1: Check buffer size before re-getting the frame
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>
2 years agoconfigure: Do not add omit-frame-pointer for ossfuzz
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>
2 years agotools/target_dec_fuzzer: Fix memleak on open failure
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>
2 years agoconfigure: fix libopus detection
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.

2 years agoavformat/concatdec: port to the new bitstream filter API
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>
2 years agotools/target_dec_fuzzer: Use decoder and not codec_id as argument
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>
2 years agoMerge commit '11a9320de54759340531177c9f2b1e31e6112cc2'
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>
2 years agoMerge commit 'f9edc734e0ca3f6ef06c1ad0bd2c19c0c66f1ffa'
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>
2 years agoMerge commit '5b26d3b789bd19a32dbe1e9c7ccab9498de7ee9b'
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>
2 years agoMerge commit 'a0c443a3980dc22eb02b067ac4cb9ffa2f9b04d2'
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>
2 years agoMerge commit 'fc322d6a70189da24dbd445c710bb214eb031ce7'
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>
2 years agoMerge commit '45286a625c6ced1f5c4c842244cbb4509429abba'
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>
2 years agoavcodec/svq3: Reject dx/dy beyond 16bit
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>
2 years agoavcodec/svq3: Increase offsets to prevent integer overflows
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>
2 years agolavc/jpeg2000dec: Fix jp2 inner atom size used for overread checks.
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.

2 years agoavcodec/decode: also check for FF_CODEC_CAP_SETS_PKT_DTS in audio decoders
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>
2 years agoavutil/softfloat: use ldexp(), fixes undefined shift
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>
2 years agoffmpeg: count packets when queued
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>
2 years agoavcodec/decode: do not treat discarded frames as eof when draining
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>
2 years agoavfilter/interlace: add complex vertical low-pass filter
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>
2 years agolavf/nutdec: Fix an impossible condition, regression since e0c53c34.
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.

2 years agoavcodec/internal: update FF_CODEC_CAP_SETS_PKT_DTS doxy
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

2 years agotools/target_dec_fuzzer: Use avcodec_register_all() instead of register_all()
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>
2 years agolavc/mips/iirfilter_mips: Include config.h.
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

2 years agolavc/mips/hevc_idct_msa: Add missing const qualifier.
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

2 years agoavcodec/indeo2: Check remaining bits in ir2_decode_plane()
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>
2 years agoavcodec/vp3: Check remaining bits in unpack_dct_coeffs()
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>
2 years agodoc/developer: Add terse documentation of assumed C implementation defined behavior
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>
2 years agoavcodec/bmp: Use ff_set_dimensions()
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>
2 years agolibavformat/http: Ignore expired cookies
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>
2 years agofate/exr : add test for negative float value
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>
2 years agofate/exr : add tests for piz uncompress
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>
2 years agolibavcodec/exr : fix piz uncompress on big endian
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>
2 years agoavcodec/options: do a more thorough clean up in avcodec_copy_context()
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>
2 years agoavcodec/options: factorize avcodec_copy_context() cleanup code
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>
2 years agoavformat/matroskaenc: add support for writing Content Light Level elements
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>
2 years agoavformat/matroskadec: export Content Light Level metadata
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>
2 years agoMerge commit 'c2fa6bb0e8703a7a6aa10e11f9ab36094416d83f'
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>
2 years agotools: Eliminate codec_type complexity from fuzzer
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>
2 years agolibswscale/tests/swscale: Fix uninitialized variables
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>
2 years agoavfilter/af_crystalizer: add support for more sample formats
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>
2 years agoavcodec/pthread_frame, decode: allow errors to happen on draining
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>
2 years agoavfilter: add video oscilloscope filter
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>
2 years agoavfilter: add pixscope filter
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>
2 years agoMerge commit 'e807491fc6a336e4becc0cbc981274a8fde18aba'
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>
2 years agoMerge commit '46191a2da16f751e53d93646ae1388d421d12bee'
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>
2 years agoMerge commit 'cfa4eb4fba782f3f37a33be997b27a91a07053c9'
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>
2 years agoMerge commit 'ea8b730d8e67152107d7fcdd5590bbb51ec236b1'
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>
2 years agoMerge commit '1783d7ec03d730c5bd96c07bc5fa7aa566f85c66'
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>
2 years agodoc/filters: add one lowpass filter example
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>
2 years agoavformat/movenc: Explicitly address potential division by zero.
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>
2 years agolibvpxenc: allow aq-mode 4 (equator360)
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>
2 years agoavfilter/lavfutils: use image2pipe demuxer on ff_load_image
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>
2 years agoavformat/hlsenc: fix CID 1405135
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>
2 years agoavformat/hlsenc: hold old key info when append list
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>
2 years agoopus_pvq: use function pointers for recursion
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>
2 years agoavcodec/opus_pvq: fix recursive inlining compilation failures
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

2 years agoavcodec/mdec: Fix runtime error: left shift of negative value -127
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>
2 years agotools/target_dec_fuzzer: Fix return code on open failure
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>
2 years agoavcodec/x86/vc1dsp_init: Fix build failure with --disable-optimizations and clang
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>
2 years agolibavcodec/exr : fix float to uint16 conversion for negative float value
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>
2 years agoopus_pvq: merge band encoding and decoding into one function
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>