OSDN Git Service

android-x86/external-ffmpeg.git
7 years agoavcodec/vp9block: fix runtime error: signed integer overflow: 196675 * 20670 cannot...
Michael Niedermayer [Sun, 21 May 2017 00:12:21 +0000 (02:12 +0200)]
avcodec/vp9block: fix runtime error: signed integer overflow: 196675 * 20670 cannot be represented in type 'int'

Fixes: 1710/clusterfuzz-testcase-minimized-4837032931098624

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/vmnc: Check location before use
Michael Niedermayer [Sun, 21 May 2017 11:22:16 +0000 (13:22 +0200)]
avcodec/vmnc: Check location before use

Fixes: runtime error: signed integer overflow: 65535 * 64256 cannot be represented in type 'int'
Fixes: 1717/clusterfuzz-testcase-minimized-5491696676634624

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/takdec: Fix runtime error: signed integer overflow: 8192 * 524308 cannot...
Michael Niedermayer [Tue, 16 May 2017 22:07:02 +0000 (00:07 +0200)]
avcodec/takdec: Fix runtime error: signed integer overflow: 8192 * 524308 cannot be represented in type 'int'

Fixes: 1630/clusterfuzz-testcase-minimized-6326111917047808

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/wavpack: Fix multiple runtime error: signed integer overflow: 548 * -21474836...
Michael Niedermayer [Thu, 18 May 2017 00:13:10 +0000 (02:13 +0200)]
avcodec/wavpack: Fix multiple runtime error: signed integer overflow: 548 * -2147483648 cannot be represented in type 'int'

Fixes: 1659/clusterfuzz-testcase-minimized-5396490639900672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/aac_defines: Fix: runtime error: left shift of negative value -2
Michael Niedermayer [Sun, 21 May 2017 00:51:04 +0000 (02:51 +0200)]
avcodec/aac_defines: Fix: runtime error: left shift of negative value -2

Fixes: 1716/clusterfuzz-testcase-minimized-4691012196761600

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/takdec: Fix runtime error: left shift of negative value -63
Michael Niedermayer [Sun, 21 May 2017 00:46:55 +0000 (02:46 +0200)]
avcodec/takdec: Fix runtime error: left shift of negative value -63

Fixes: 1713/clusterfuzz-testcase-minimized-5791887476654080

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/mlpdsp: Fix runtime error: signed integer overflow: -24419392 * 128 cannot...
Michael Niedermayer [Sun, 21 May 2017 00:42:12 +0000 (02:42 +0200)]
avcodec/mlpdsp: Fix runtime error: signed integer overflow: -24419392 * 128 cannot be represented in type 'int'

Fixes: 1711/clusterfuzz-testcase-minimized-5248503515185152

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/sbrdsp_fixed: fix runtime error: left shift of 1 by 31 places cannot be repre...
Michael Niedermayer [Sat, 20 May 2017 23:43:04 +0000 (01:43 +0200)]
avcodec/sbrdsp_fixed: fix runtime error: left shift of 1 by 31 places cannot be represented in type 'int'

Fixes: part of 1709/clusterfuzz-testcase-minimized-4513580554649600

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/aacsbr_fixed: Fix multiple runtime error: shift exponent 170 is too large...
Michael Niedermayer [Sat, 20 May 2017 22:06:10 +0000 (00:06 +0200)]
avcodec/aacsbr_fixed: Fix multiple runtime error: shift exponent 170 is too large for 32-bit type 'int'

Fixes part of 1709/clusterfuzz-testcase-minimized-4513580554649600

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoconfigure: fix --tempprefix option
James Almer [Sun, 21 May 2017 00:29:58 +0000 (21:29 -0300)]
configure: fix --tempprefix option

It was broken in 091c9860559e4d33179747c5d651bc9e31bd76eb

7 years agoavfilter: take_samples: do not directly return frame when samples are skipped
Muhammad Faiz [Thu, 18 May 2017 13:10:47 +0000 (20:10 +0700)]
avfilter: take_samples: do not directly return frame when samples are skipped

Modifying data pointer when skipping samples may make it unaligned.
Workaround for Ticket6349.

This should fix the crash of ticket's testcase and a crash/regression
with avxsynth (reported by Michael Niedermayer).

Also change frame->nb_samples < max to frame->nb_samples <= max.
This improves performance. Benchmark:
./ffmpeg -filter_complex "aevalsrc=0:n=1166,firequalizer=fixed=on" -f null null
old:
  25767 decicycles in take_samples,    1023 runs,      1 skips
  25422 decicycles in take_samples,    2047 runs,      1 skips
  25181 decicycles in take_samples,    4095 runs,      1 skips
  24904 decicycles in take_samples,    8191 runs,      1 skips

new:
    550 decicycles in take_samples,    1024 runs,      0 skips
    548 decicycles in take_samples,    2048 runs,      0 skips
    545 decicycles in take_samples,    4096 runs,      0 skips
    544 decicycles in take_samples,    8192 runs,      0 skips

Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
7 years agoavcodec/decode: fix function name
James Almer [Sat, 20 May 2017 16:17:12 +0000 (13:17 -0300)]
avcodec/decode: fix function name

7 years agodecode: fix the code reducing cropping to preserve alignment
Anton Khirnov [Fri, 19 May 2017 09:47:21 +0000 (11:47 +0200)]
decode: fix the code reducing cropping to preserve alignment

Currently it does not work at all.

Libav Bug-Id: 1058
(cherry picked from commit 8652a2c24836ce5546b398f12b7fed45000050e1)

7 years agoavcodec/g723_1dec: Clip after shift in estimate_sid_gain()
Michael Niedermayer [Sat, 20 May 2017 12:16:57 +0000 (14:16 +0200)]
avcodec/g723_1dec: Clip after shift in estimate_sid_gain()

Fixes: runtime error: left shift of 706 by 22 places cannot be represented in type 'int'
See: L_shl() in the reference software
Fixes: 1609/clusterfuzz-testcase-minimized-5102163007111168

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoMerge commit 'e519dcd937c7c98815ba9884867590e302272016'
Clément Bœsch [Sat, 20 May 2017 14:55:22 +0000 (16:55 +0200)]
Merge commit 'e519dcd937c7c98815ba9884867590e302272016'

* commit 'e519dcd937c7c98815ba9884867590e302272016':
  dashenc: separate segments based on current segment duration

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92'
Clément Bœsch [Sat, 20 May 2017 14:52:10 +0000 (16:52 +0200)]
Merge commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92'

* commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92':
  dashenc: add option to provide UTC timing source

Also use E instead of AV_OPT_FLAG_ENCODING_PARAM to be consistent with
the other AVOption.

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc'
Clément Bœsch [Sat, 20 May 2017 14:50:28 +0000 (16:50 +0200)]
Merge commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc'

* commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc':
  configure: Clean up temporary files on interrupt

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '78489822074096e3ae0f3c3b70accace955086f6'
Clément Bœsch [Sat, 20 May 2017 14:44:58 +0000 (16:44 +0200)]
Merge commit '78489822074096e3ae0f3c3b70accace955086f6'

* commit '78489822074096e3ae0f3c3b70accace955086f6':
  configure: Place all temporary files in one separate directory

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '11e225db31dcad57e2219ad8dfae2ac027af53d6'
Clément Bœsch [Sat, 20 May 2017 14:42:48 +0000 (16:42 +0200)]
Merge commit '11e225db31dcad57e2219ad8dfae2ac027af53d6'

* commit '11e225db31dcad57e2219ad8dfae2ac027af53d6':
  rtmp: Account for bytes_read wraparound

This commit is a noop, see 0849a0ebb2c94856c3a94cb114a1412e44904c28

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'ca6ae3b77a7e6600e517723b90e57527a47809de'
Clément Bœsch [Sat, 20 May 2017 14:40:36 +0000 (16:40 +0200)]
Merge commit 'ca6ae3b77a7e6600e517723b90e57527a47809de'

* commit 'ca6ae3b77a7e6600e517723b90e57527a47809de':
  vaapi_encode: Add MPEG-2 support

This commit is a noop, see 3b95c7c17de0c5048eb1d38454e1c88e85517067

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee'
Clément Bœsch [Sat, 20 May 2017 14:39:10 +0000 (16:39 +0200)]
Merge commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee'

* commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee':
  dashenc: increase buffer time hint in the manifest

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18'
Clément Bœsch [Sat, 20 May 2017 14:37:04 +0000 (16:37 +0200)]
Merge commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18'

* commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18':
  dashenc: add mandatory id to AdaptationSet and Period in manifest

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a'
Clément Bœsch [Sat, 20 May 2017 14:32:20 +0000 (16:32 +0200)]
Merge commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a'

* commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a':
  dashenc: fix ISO8601 UTC parsing

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce'
Clément Bœsch [Sat, 20 May 2017 14:31:37 +0000 (16:31 +0200)]
Merge commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce'

* commit '2bbb5abd877104fa9bc342c521bb49bc1aad50ce':
  build: Map -Wall compiler flag to -W3 for MSVC and -Wextra to -W4

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4'
Clément Bœsch [Sat, 20 May 2017 14:28:43 +0000 (16:28 +0200)]
Merge commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4'

* commit '6151e9128ce2a84a443c82b78f5b5cb364ba2ab4':
  build: Detect blocks C language extension and add it as VDA dependency

Merged-by: Clément Bœsch <u@pkh.me>
7 years agolavf/mov: make invalid m{d,v}hd time_scale default to 1 instead of erroring out
Matthieu Bouron [Thu, 11 May 2017 13:16:22 +0000 (15:16 +0200)]
lavf/mov: make invalid m{d,v}hd time_scale default to 1 instead of erroring out

Some samples have their metadata track time_scale incorrectly set to 0
and the check introduced by a398f054fdb9b0f0b5a91c231fba6ce014143f71
prevents playback of those samples. Setting the time_scale to 1 fixes
playback.

7 years agoavfilter/af_sidechaincompress: change default makeup gain to 1
Paul B Mahol [Sat, 20 May 2017 10:34:51 +0000 (12:34 +0200)]
avfilter/af_sidechaincompress: change default makeup gain to 1

This avoids producing out of range or clipped samples.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/mlpdec: Do not leave a invalid num_primitive_matrices in the context
Michael Niedermayer [Fri, 19 May 2017 23:23:01 +0000 (01:23 +0200)]
avcodec/mlpdec: Do not leave a invalid num_primitive_matrices in the context

Fixes: runtime error: index 8 out of bounds for type 'uint8_t [8]'
Fixes: 1699/clusterfuzz-testcase-minimized-6327177438035968

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavformat/id3v2: Use ffio_ensure_seekback() in id3v2_read_internal()
Michael Niedermayer [Fri, 19 May 2017 18:54:03 +0000 (20:54 +0200)]
avformat/id3v2: Use ffio_ensure_seekback() in id3v2_read_internal()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavformat/aviobuf: Only downscale the buffer once it has been used
Michael Niedermayer [Fri, 19 May 2017 18:52:44 +0000 (20:52 +0200)]
avformat/aviobuf: Only downscale the buffer once it has been used

The code mistook the first iteration sometimes as the end

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavfilter/graphparser: allow specifying filter@id as filter instance
Muhammad Faiz [Wed, 17 May 2017 06:03:28 +0000 (13:03 +0700)]
avfilter/graphparser: allow specifying filter@id as filter instance

See http://lists.ffmpeg.org/pipermail/ffmpeg-user/2017-April/035975.html
Parsed_filter_X could remain and user can override it with custom one.

Example:
ffplay -f lavfi "nullsrc=s=640x360,
sendcmd='1 drawtext@top reinit text=Hello; 2 drawtext@bottom reinit text=World',
drawtext@top=x=16:y=16:fontsize=20:fontcolor=Red:text='',
drawtext@bottom=x=16:y=340:fontsize=16:fontcolor=Blue:text=''"

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
7 years agoavcodec/aacsbr_fixed: Fix multiple runtime error: shift exponent 150 is too large...
Michael Niedermayer [Fri, 19 May 2017 10:25:52 +0000 (12:25 +0200)]
avcodec/aacsbr_fixed: Fix multiple runtime error: shift exponent 150 is too large for 32-bit type 'int'

Fixes: 1681/clusterfuzz-testcase-minimized-5970545365483520

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/aacsbr_fixed: Fix multiple runtime error: left shift of negative value -407
Michael Niedermayer [Fri, 19 May 2017 10:14:59 +0000 (12:14 +0200)]
avcodec/aacsbr_fixed: Fix multiple runtime error: left shift of negative value -407

Fixes: 1674/clusterfuzz-testcase-minimized-6092531563495424
Fixes: 1686/clusterfuzz-testcase-minimized-6282691643179008

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoMerge commit 'f96d07f4ec4193fb5293d7ac8f1324aac3c3ea07'
Clément Bœsch [Fri, 19 May 2017 10:01:43 +0000 (12:01 +0200)]
Merge commit 'f96d07f4ec4193fb5293d7ac8f1324aac3c3ea07'

* commit 'f96d07f4ec4193fb5293d7ac8f1324aac3c3ea07':
  configure: Add quotes around a variable which might be empty

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b'
Clément Bœsch [Fri, 19 May 2017 10:01:04 +0000 (12:01 +0200)]
Merge commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b'

* commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b':
  fifo: Return the correct AVERROR value

This commit is a noop, see 2e81bb5e92351cc88d88a1c55d21b13532131524

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f'
Clément Bœsch [Fri, 19 May 2017 09:59:35 +0000 (11:59 +0200)]
Merge commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f'

* commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f':
  configure: Use proper compiler-specific speed flags for hostcc

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be'
Clément Bœsch [Fri, 19 May 2017 09:54:30 +0000 (11:54 +0200)]
Merge commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be'

* commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be':
  configure: Move optflags checks to a more sensible place

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '381a4e31a6b801a046e38b0e2b08fb61499157a7'
Clément Bœsch [Fri, 19 May 2017 09:52:13 +0000 (11:52 +0200)]
Merge commit '381a4e31a6b801a046e38b0e2b08fb61499157a7'

* commit '381a4e31a6b801a046e38b0e2b08fb61499157a7':
  tak: Convert to the new bitstream reader
  magicyuv: Convert to the new bitstream reader
  truemotion2rt: Convert to the new bitstream reader
  wavpack: Convert to the new bitstream reader
  mpc: 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>
7 years agoMerge commit 'b83aea73404f6f9314e72fe5d6238deaffa12b2c'
Clément Bœsch [Fri, 19 May 2017 09:47:36 +0000 (11:47 +0200)]
Merge commit 'b83aea73404f6f9314e72fe5d6238deaffa12b2c'

* commit 'b83aea73404f6f9314e72fe5d6238deaffa12b2c':
  des-test: Pass the proper types to av_des_*() functions

See 183c3fa48acaf4561d5269ab9a766d13ae70140c

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec'
Clément Bœsch [Fri, 19 May 2017 09:23:07 +0000 (11:23 +0200)]
Merge commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec'

* commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec':
  swscale-test: const correctness for pointer variable

This commit is a noop, see b36745339df026264007b6baaee50584a8a95c22

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '7ff018c1cb43a5fe5ee2049d325cdd785852067a'
Clément Bœsch [Fri, 19 May 2017 09:21:41 +0000 (11:21 +0200)]
Merge commit '7ff018c1cb43a5fe5ee2049d325cdd785852067a'

* commit '7ff018c1cb43a5fe5ee2049d325cdd785852067a':
  OS/2: Try to commit memory above 1GB

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'fd8de7f2d8c31195d309247cb129c0ad787ef76e'
Clément Bœsch [Fri, 19 May 2017 09:19:29 +0000 (11:19 +0200)]
Merge commit 'fd8de7f2d8c31195d309247cb129c0ad787ef76e'

* commit 'fd8de7f2d8c31195d309247cb129c0ad787ef76e':
  dxtory: Convert to the new bitstream reader
  apedec: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
7 years agolavc/mpegvideoenc: reformat inv_zigzag_direct16 so the zigzag pattern is visible
Clément Bœsch [Fri, 19 May 2017 09:17:58 +0000 (11:17 +0200)]
lavc/mpegvideoenc: reformat inv_zigzag_direct16 so the zigzag pattern is visible

7 years agoMerge commit 'b4a911c189962e563a09fb0efaf6fa9ab56263a4'
Clément Bœsch [Fri, 19 May 2017 09:15:16 +0000 (11:15 +0200)]
Merge commit 'b4a911c189962e563a09fb0efaf6fa9ab56263a4'

* commit 'b4a911c189962e563a09fb0efaf6fa9ab56263a4':
  mpegvideoenc: make a table const

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '296eff4d9dc53d441b672319524a051d04f4a8cf'
Clément Bœsch [Fri, 19 May 2017 09:12:24 +0000 (11:12 +0200)]
Merge commit '296eff4d9dc53d441b672319524a051d04f4a8cf'

* commit '296eff4d9dc53d441b672319524a051d04f4a8cf':
  zmbvenc: get rid of a global table

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '00b775dda2b3f78ae60ff3278d3b3d6545883a83'
Clément Bœsch [Fri, 19 May 2017 09:09:20 +0000 (11:09 +0200)]
Merge commit '00b775dda2b3f78ae60ff3278d3b3d6545883a83'

* commit '00b775dda2b3f78ae60ff3278d3b3d6545883a83':
  hevc: Mark as having threadsafe init

This commit is a noop, see 14b9060160e453398d01ca767c0f8ace9fb4b5e3

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '54dcd2288546e135986338107ea87db1fcedd633'
Clément Bœsch [Fri, 19 May 2017 09:07:46 +0000 (11:07 +0200)]
Merge commit '54dcd2288546e135986338107ea87db1fcedd633'

* commit '54dcd2288546e135986338107ea87db1fcedd633':
  als: Convert to the new bitstream reader

This commit is a noop, see
http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'fb59f87ce72035b940c3f5045884098b9324e1b2'
Clément Bœsch [Fri, 19 May 2017 09:07:03 +0000 (11:07 +0200)]
Merge commit 'fb59f87ce72035b940c3f5045884098b9324e1b2'

* commit 'fb59f87ce72035b940c3f5045884098b9324e1b2':
  nvenc: Explicitly push the cuda context on encoding

This commit is a noop, see be74ba648cf4063c9805ebe95ee83fd7299f7fd5

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '4795e4f61f993940c5384044caff56cc15078698'
Clément Bœsch [Fri, 19 May 2017 09:00:02 +0000 (11:00 +0200)]
Merge commit '4795e4f61f993940c5384044caff56cc15078698'

* commit '4795e4f61f993940c5384044caff56cc15078698':
  alac: Convert to the new bitstream reader
  rtp: Convert to the new bitstream reader
  mov: 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>
7 years agoMerge commit '44129e38047b6a27291e487c2084894958c6f399'
Clément Bœsch [Fri, 19 May 2017 08:57:30 +0000 (10:57 +0200)]
Merge commit '44129e38047b6a27291e487c2084894958c6f399'

* commit '44129e38047b6a27291e487c2084894958c6f399':
  avconv: Do not pass NULL to avio_tell

This commit is a noop. The FFmpeg code handle cases where total_size is
an AVERROR (which avio_tell(NULL) will return) later in the function.

Note: the original commit refers to the null *muxer*. `ffmpeg -lavfi
testsrc -f null -` can be used as a test case.

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoavcodec/hevc_parser: add missing call to ff_hevc_reset_sei()
James Almer [Thu, 18 May 2017 22:54:09 +0000 (19:54 -0300)]
avcodec/hevc_parser: add missing call to ff_hevc_reset_sei()

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavfilter/af_sofalizer: make lfe gain user configurable
Paul B Mahol [Thu, 18 May 2017 21:13:52 +0000 (23:13 +0200)]
avfilter/af_sofalizer: make lfe gain user configurable

Default settings have it too low.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavfilter/af_sofalizer: avoid casting
Paul B Mahol [Thu, 18 May 2017 20:49:04 +0000 (22:49 +0200)]
avfilter/af_sofalizer: avoid casting

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/mimic: Use ff_set_dimensions() to set the dimensions
Michael Niedermayer [Thu, 18 May 2017 15:46:56 +0000 (17:46 +0200)]
avcodec/mimic: Use ff_set_dimensions() to set the dimensions

Fixes: OOM
Fixes: 1671/clusterfuzz-testcase-minimized-4759078033162240

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/fic: Fix multiple runtime error: signed integer overflow: 5793 * 419752 canno...
Michael Niedermayer [Thu, 18 May 2017 15:13:18 +0000 (17:13 +0200)]
avcodec/fic: Fix multiple runtime error: signed integer overflow: 5793 * 419752 cannot be represented in type 'int'

Fixes: 1669/clusterfuzz-testcase-minimized-5287529198649344

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/pixlet: Fix reading invalid numbers of bits
Michael Niedermayer [Thu, 18 May 2017 14:51:08 +0000 (16:51 +0200)]
avcodec/pixlet: Fix reading invalid numbers of bits

Fixes: asertion failure
Fixes: 1664/clusterfuzz-testcase-minimized-6587801187385344

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agodoc/filters: add more ladspa examples
Paul B Mahol [Thu, 18 May 2017 15:38:18 +0000 (17:38 +0200)]
doc/filters: add more ladspa examples

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/mlpdec: Fix: runtime error: left shift of negative value -8
Michael Niedermayer [Thu, 18 May 2017 00:07:17 +0000 (02:07 +0200)]
avcodec/mlpdec: Fix: runtime error: left shift of negative value -8

Fixes: 1658/clusterfuzz-testcase-minimized-4889937130291200

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/dfa: Fix: runtime error: signed integer overflow: -14202 * 196877 cannot...
Michael Niedermayer [Wed, 17 May 2017 23:54:43 +0000 (01:54 +0200)]
avcodec/dfa: Fix: runtime error: signed integer overflow: -14202 * 196877 cannot be represented in type 'int'

Fixes: 1657/clusterfuzz-testcase-minimized-4710000079405056

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agobuild: remove --enable-raise-major configure option
James Almer [Sat, 6 May 2017 21:50:09 +0000 (18:50 -0300)]
build: remove --enable-raise-major configure option

It's not used by anything, has dubious usefulness, the reasons for which
it was introduced are no longer valid, and only serves to add complexity
to the build system.

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavformat/movenc: remove experimental check for VP9 streams
James Almer [Wed, 17 May 2017 23:37:39 +0000 (20:37 -0300)]
avformat/movenc: remove experimental check for VP9 streams

The muxer has been updated and is now complaint with the v1.0 of the spec.

7 years agoavfilter/af_afade: fix fading very long durations
Paul B Mahol [Wed, 17 May 2017 20:59:11 +0000 (22:59 +0200)]
avfilter/af_afade: fix fading very long durations

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit 'f8f7ad758d0e1f36915467567f4d75541d98c12f'
Mark Thompson [Wed, 17 May 2017 18:24:36 +0000 (19:24 +0100)]
Merge commit 'f8f7ad758d0e1f36915467567f4d75541d98c12f'

* commit 'f8f7ad758d0e1f36915467567f4d75541d98c12f':
  qsv: Set the correct range for la_depth

This commit is a noop.  There is a separate parameter to enable
lookahead, so overloading the depth is unnecessary.

Merged-by: Mark Thompson <sw@jkqxz.net>
7 years agoavfilter: add audio crossfeed filter
Paul B Mahol [Sun, 14 May 2017 16:30:12 +0000 (18:30 +0200)]
avfilter: add audio crossfeed filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavcodec/aacdec: Fix runtime error: signed integer overflow: 2147483520 + 255 cannot...
Michael Niedermayer [Wed, 17 May 2017 14:45:46 +0000 (16:45 +0200)]
avcodec/aacdec: Fix runtime error: signed integer overflow: 2147483520 + 255 cannot be represented in type 'int'

Fixes: 1656/clusterfuzz-testcase-minimized-5900404925661184

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/rv34: Fix runtime error: signed integer overflow: 768 * 4126720 cannot be...
Michael Niedermayer [Wed, 17 May 2017 14:33:16 +0000 (16:33 +0200)]
avcodec/rv34: Fix runtime error: signed integer overflow: 768 * 4126720 cannot be represented in type 'int'

Fixes: 1655/clusterfuzz-testcase-minimized-5587079276789760

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/aacdec_template: Fix fixed point scale in decode_cce()
Michael Niedermayer [Wed, 17 May 2017 13:51:46 +0000 (15:51 +0200)]
avcodec/aacdec_template: Fix fixed point scale in decode_cce()

Fixes: runtime error: shift exponent 1073741824 is too large for 32-bit type 'int'
Fixes: 1654/clusterfuzz-testcase-minimized-5151903795118080

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoMAINTAINERS: Remove Tomas Härdin from mxfdec.c
James Almer [Wed, 17 May 2017 04:52:53 +0000 (01:52 -0300)]
MAINTAINERS: Remove Tomas Härdin from mxfdec.c

See https://ffmpeg.org/pipermail/ffmpeg-devel/2017-May/211404.html

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavcodec/fmvc: Fix off by 1 error
Michael Niedermayer [Wed, 17 May 2017 00:17:13 +0000 (02:17 +0200)]
avcodec/fmvc: Fix off by 1 error

Fixes: out of array access
Fixes: 1643/clusterfuzz-testcase-minimized-6117573403869184

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/h264_cavlc: Fix runtime error: index -1 out of bounds for type 'VLC [6]'
Michael Niedermayer [Wed, 17 May 2017 00:06:49 +0000 (02:06 +0200)]
avcodec/h264_cavlc: Fix runtime error: index -1 out of bounds for type 'VLC [6]'

Fixes: 1639/clusterfuzz-testcase-minimized-5693801463021568

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/flicvideo: Check frame_size before decrementing
Michael Niedermayer [Tue, 16 May 2017 23:12:55 +0000 (01:12 +0200)]
avcodec/flicvideo: Check frame_size before decrementing

Fixes: runtime error: signed integer overflow: -2147483627 - 22 cannot be represented in type 'int'
Fixes: 1637/clusterfuzz-testcase-minimized-5376582493405184

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/mlpdec: Fix runtime error: left shift of negative value -1
Michael Niedermayer [Tue, 16 May 2017 22:53:32 +0000 (00:53 +0200)]
avcodec/mlpdec: Fix runtime error: left shift of negative value -1

Fixes: 1636/clusterfuzz-testcase-minimized-5310494757879808

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/takdec: Fix runtime error: left shift of negative value -42
Michael Niedermayer [Tue, 16 May 2017 22:44:36 +0000 (00:44 +0200)]
avcodec/takdec: Fix  runtime error: left shift of negative value -42

Fixes: 1635/clusterfuzz-testcase-minimized-4992749856096256

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/hq_hqa: Fix: runtime error: signed integer overflow: -255 * 10180917 cannot...
Michael Niedermayer [Tue, 16 May 2017 21:44:24 +0000 (23:44 +0200)]
avcodec/hq_hqa: Fix: runtime error: signed integer overflow: -255 * 10180917 cannot be represented in type 'int'

Fixes: 1626/clusterfuzz-testcase-minimized-6416580571299840

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/scpr: mask bits to prevent out of array read
Michael Niedermayer [Tue, 16 May 2017 00:22:37 +0000 (02:22 +0200)]
avcodec/scpr: mask bits to prevent out of array read

Fixes: 1615/clusterfuzz-testcase-minimized-6625214647500800

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agodoc/filters: Added line to the af_bs2b filter docs mentioning --enable-libbs2b
Leo Izen [Mon, 15 May 2017 23:38:36 +0000 (19:38 -0400)]
doc/filters: Added line to the af_bs2b filter docs mentioning --enable-libbs2b

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/truemotion1: Fix multiple runtime error: signed integer overflow: 1246906962...
Michael Niedermayer [Tue, 16 May 2017 01:04:26 +0000 (03:04 +0200)]
avcodec/truemotion1: Fix multiple runtime error: signed integer overflow: 1246906962 * 2 cannot be represented in type 'int'

Fixes: 1616/clusterfuzz-testcase-minimized-5119196578971648

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavutil/hwcontext_dxva2: Don't improperly free IDirect3DSurface9 objects
Aaron Levinson [Tue, 16 May 2017 12:04:36 +0000 (05:04 -0700)]
avutil/hwcontext_dxva2: Don't improperly free IDirect3DSurface9 objects

Add dxva2_pool_release_dummy() and use it in call to
av_buffer_create() in dxva2_pool_alloc().

Prior to this change, av_buffer_create() was called with NULL for the
third argument, which indicates that av_buffer_default_free() should
be used to free the buffer's data.  Eventually, it gets to
buffer_pool_free() and calls buf->free() on a surface object (which is
av_buffer_default_free()).

This can result in a crash when the debug version of the C-runtime is
used on Windows.  While it doesn't appear to result in a crash when
the release version of the C-runtime is used on Windows, it likely
results in memory corruption, since av_free() is being called on
memory that was allocated using
IDirectXVideoAccelerationService::CreateSurface().

Signed-off-by: Aaron Levinson <alevinsn@aracnet.com>
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Reviewed-by: Mark Thompson <sw@jkqxz.net>
7 years agoavcodec/allcodecs: move librsvg_decoder to the external library section
James Almer [Tue, 16 May 2017 17:45:20 +0000 (14:45 -0300)]
avcodec/allcodecs: move librsvg_decoder to the external library section

7 years agoavfilter/af_bs2b: add missing flag for options
Paul B Mahol [Tue, 16 May 2017 17:16:50 +0000 (19:16 +0200)]
avfilter/af_bs2b: add missing flag for options

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoimg2dec: use standard way to probe for svg/svgz files
Rostislav Pehlivanov [Tue, 16 May 2017 11:45:14 +0000 (12:45 +0100)]
img2dec: use standard way to probe for svg/svgz files

7 years agolibrsvgdec: Fix pix_fmt on big-endian hardware.
Carl Eugen Hoyos [Tue, 16 May 2017 10:51:52 +0000 (12:51 +0200)]
librsvgdec: Fix pix_fmt on big-endian hardware.

7 years agolavc: add a librsvg rasterization library wrapper
Rostislav Pehlivanov [Mon, 8 May 2017 04:02:19 +0000 (05:02 +0100)]
lavc: add a librsvg rasterization library wrapper

Enables rendering of SVG images. This is possible since SVG images
still contain and specify the dimensions in pixels to which they've
been drawn to and thus enable browsers to display them without any
external data. Users can still override and generate images with
arbitrary resolutions.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
7 years agoimg2dec: add support for piped SVG demuxing
Rostislav Pehlivanov [Mon, 8 May 2017 04:00:41 +0000 (05:00 +0100)]
img2dec: add support for piped SVG demuxing

Only checks the extension and MIME type, since determining whether
a file is SVG is difficult since they're just XML files.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
7 years agolavc: add codec ID and description for SVG
Rostislav Pehlivanov [Mon, 8 May 2017 03:59:40 +0000 (04:59 +0100)]
lavc: add codec ID and description for SVG

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
7 years agoavcodec/dcaenc: Do not abort process in case of bitrate deficit
Daniil Cherednik [Thu, 11 May 2017 21:12:07 +0000 (21:12 +0000)]
avcodec/dcaenc: Do not abort process in case of bitrate deficit

Old behaviour - abort if at least one subband has 1bit quantizer
and consumed_bits still greater than frame_bits size. It was
a bit strange - we still could reduce bits consumption by reducing
SNR for other subbands. Same strange logic with upper threshold -
stop bits allocation if at least one subband reach 26bits.

New behaviour - if consumed_bits greater than frame_bits and all
subbands has 1 bit quantizer we restart bits allocation and allow
zero subbands.

7 years agoopus_pvq: port to allow for SIMD functions
Rostislav Pehlivanov [Wed, 10 May 2017 05:47:44 +0000 (06:47 +0100)]
opus_pvq: port to allow for SIMD functions

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
7 years agoopusenc: initialize PVQ prng seed
Rostislav Pehlivanov [Wed, 10 May 2017 05:07:46 +0000 (06:07 +0100)]
opusenc: initialize PVQ prng seed

Fixes valgrind warnings, didn't affect anything since it was only used
for resynthesis.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
7 years agoconfigure: jni no longer requires -ldl
Aman Gupta [Fri, 12 May 2017 18:34:24 +0000 (11:34 -0700)]
configure: jni no longer requires -ldl

This dependency was removed in 33d69a90085d30af8a292d9364b835a26565d6b9.

7 years agoavcodec/svq3: Fix runtime error: left shift of negative value -6
Michael Niedermayer [Mon, 15 May 2017 19:21:20 +0000 (21:21 +0200)]
avcodec/svq3: Fix runtime error: left shift of negative value -6

Fixes: 1604/clusterfuzz-testcase-minimized-5312060206350336

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/tiff: reset sampling[] if its invalid
Michael Niedermayer [Mon, 15 May 2017 19:19:06 +0000 (21:19 +0200)]
avcodec/tiff: reset sampling[] if its invalid

Fixes divission by 0
Fixes: clusterfuzz-testcase-minimized-5592896440893440

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agomovenc/isom: update vpcC box to version 1.0 of the specification
Hendrik Leppkes [Fri, 21 Apr 2017 23:25:40 +0000 (01:25 +0200)]
movenc/isom: update vpcC box to version 1.0 of the specification

This brings our generation of the vpcC box up to date to version 1.0
of the VP Codec ISO Media File Format Binding.

Specifically, color/transfer properties are now written with values
based on ISO/IEC 23001-8, which is the same reference specification the
AVColor* enumerations are based on.

7 years agoavfilter/vf_deflicker: add bypass option
Paul B Mahol [Mon, 15 May 2017 19:32:44 +0000 (21:32 +0200)]
avfilter/vf_deflicker: add bypass option

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoavfilter/af_stereotools: introduce different balance modes
Paul B Mahol [Mon, 15 May 2017 17:56:55 +0000 (19:56 +0200)]
avfilter/af_stereotools: introduce different balance modes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agocompat/cuda/ptx2c: remove bashism and harden against arbitrary input
Timo Rothenpieler [Mon, 15 May 2017 16:05:10 +0000 (18:05 +0200)]
compat/cuda/ptx2c: remove bashism and harden against arbitrary input

7 years agohwcontext_videotoolbox: fix fate-source
wm4 [Mon, 15 May 2017 16:50:04 +0000 (18:50 +0200)]
hwcontext_videotoolbox: fix fate-source

Thanks to James Darnley for figuring out what the hell it wanted.

7 years agoavcodec/Makefile: fix dnxhd parser dependencies
James Almer [Mon, 15 May 2017 16:33:29 +0000 (13:33 -0300)]
avcodec/Makefile: fix dnxhd parser dependencies

Fixes ticket #6391

7 years agoavcodec/h264: add sse2 versions of previous idct functions
James Darnley [Wed, 5 Apr 2017 19:07:47 +0000 (21:07 +0200)]
avcodec/h264: add sse2 versions of previous idct functions

Kaby Lake Pentium:
 - ff_h264_idct_add_8_sse2:    ~1.18x faster than mmxext
 - ff_h264_idct_dc_add_8_sse2: ~1.07x faster than mmxext

7 years agoavcodec/h264: add avx 8-bit h264_idct_dc_add
James Darnley [Thu, 16 Mar 2017 14:07:11 +0000 (15:07 +0100)]
avcodec/h264: add avx 8-bit h264_idct_dc_add

Haswell:
 - 1.02x faster (405±0.7 vs. 397±0.8 decicycles) compared with mmxext

Skylake-U:
 - 1.06x faster (498±1.8 vs. 470±1.3 decicycles) compared with mmxext

7 years agoavcodec/h264: add avx 8-bit h264_idct_add
James Darnley [Thu, 16 Mar 2017 13:59:48 +0000 (14:59 +0100)]
avcodec/h264: add avx 8-bit h264_idct_add

Haswell:
 - 1.11x faster (522±0.4 vs. 469±1.8 decicycles) compared with mmxext

Skylake-U:
 - 1.21x faster (671±5.5 vs. 555±1.4 decicycles) compared with mmxext