Commit Graph

86201 Commits

Author SHA1 Message Date
Michael Niedermayer 23868ad5cb 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>
2017-05-20 17:55:01 +02:00
Clément Bœsch 1a950f32ab Merge commit 'e519dcd937c7c98815ba9884867590e302272016'
* commit 'e519dcd937c7c98815ba9884867590e302272016':
  dashenc: separate segments based on current segment duration

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:55:22 +02:00
Clément Bœsch e815111367 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>
2017-05-20 16:53:36 +02:00
Clément Bœsch a8ad127a63 Merge commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc'
* commit 'ba6a49e60bdd61b6d02c2b26daa01942c35f39cc':
  configure: Clean up temporary files on interrupt

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:50:28 +02:00
Clément Bœsch 091c986055 Merge commit '78489822074096e3ae0f3c3b70accace955086f6'
* commit '78489822074096e3ae0f3c3b70accace955086f6':
  configure: Place all temporary files in one separate directory

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:47:20 +02:00
Clément Bœsch e78dc57888 Merge commit '11e225db31dcad57e2219ad8dfae2ac027af53d6'
* commit '11e225db31dcad57e2219ad8dfae2ac027af53d6':
  rtmp: Account for bytes_read wraparound

This commit is a noop, see 0849a0ebb2

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:42:48 +02:00
Clément Bœsch 1ff55e12f7 Merge commit 'ca6ae3b77a7e6600e517723b90e57527a47809de'
* commit 'ca6ae3b77a7e6600e517723b90e57527a47809de':
  vaapi_encode: Add MPEG-2 support

This commit is a noop, see 3b95c7c17d

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:40:36 +02:00
Clément Bœsch ba3adea957 Merge commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee'
* commit '3c2717e48dd8c5115f2be35c2afcabd8a1f67aee':
  dashenc: increase buffer time hint in the manifest

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:39:10 +02:00
Clément Bœsch 77a20cff36 Merge commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18'
* commit '95f1004bdfdf2d26c330c1d4b7c4ac9352d60b18':
  dashenc: add mandatory id to AdaptationSet and Period in manifest

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:37:04 +02:00
Clément Bœsch 93bf0480c2 Merge commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a'
* commit '1ae6cb7d6e4fee30754a46bc91f40ff75ac4412a':
  dashenc: fix ISO8601 UTC parsing

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-20 16:32:20 +02:00
Clément Bœsch 068d91885f 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>
2017-05-20 16:31:37 +02:00
Clément Bœsch d1da0fc4b9 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>
2017-05-20 16:28:43 +02:00
Matthieu Bouron ab61b79b1c 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 a398f054fd
prevents playback of those samples. Setting the time_scale to 1 fixes
playback.
2017-05-20 12:56:35 +02:00
Paul B Mahol e8ae23db27 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>
2017-05-20 12:43:11 +02:00
Michael Niedermayer 64ea4d102a 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>
2017-05-20 01:24:11 +02:00
Michael Niedermayer 0cc6dd1b81 avformat/id3v2: Use ffio_ensure_seekback() in id3v2_read_internal()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-19 21:14:26 +02:00
Michael Niedermayer 7383a835e4 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>
2017-05-19 21:14:26 +02:00
Muhammad Faiz 162414cefe 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>
2017-05-19 20:21:47 +07:00
Michael Niedermayer 3fb104f447 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>
2017-05-19 13:14:12 +02:00
Michael Niedermayer 2ccd2c9003 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>
2017-05-19 13:14:12 +02:00
Clément Bœsch 55b56a8d6a Merge commit 'f96d07f4ec4193fb5293d7ac8f1324aac3c3ea07'
* commit 'f96d07f4ec4193fb5293d7ac8f1324aac3c3ea07':
  configure: Add quotes around a variable which might be empty

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 12:01:43 +02:00
Clément Bœsch c909b77fe3 Merge commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b'
* commit '562ef82d6a7f96f6b9da1219a5aaf7d9d7056f1b':
  fifo: Return the correct AVERROR value

This commit is a noop, see 2e81bb5e92

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 12:01:04 +02:00
Clément Bœsch 2fbeb42df3 Merge commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f'
* commit '9bf262f4c6e14f43f291cdb745ed372884ee2a7f':
  configure: Use proper compiler-specific speed flags for hostcc

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:59:35 +02:00
Clément Bœsch f78f3df7e0 Merge commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be'
* commit 'bf38959a30ecba4e4ee95d4f2a80ba7ece4f34be':
  configure: Move optflags checks to a more sensible place

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:54:30 +02:00
Clément Bœsch 89d277af00 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>
2017-05-19 11:52:32 +02:00
Clément Bœsch 6a3538bb23 Merge commit 'b83aea73404f6f9314e72fe5d6238deaffa12b2c'
* commit 'b83aea73404f6f9314e72fe5d6238deaffa12b2c':
  des-test: Pass the proper types to av_des_*() functions

See 183c3fa48a

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:50:28 +02:00
Clément Bœsch 5d986609ba Merge commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec'
* commit '5c0e2b13eb79b455b15355d64f7993b0f66ea9ec':
  swscale-test: const correctness for pointer variable

This commit is a noop, see b36745339d

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:23:07 +02:00
Clément Bœsch 42ed79a229 Merge commit '7ff018c1cb43a5fe5ee2049d325cdd785852067a'
* commit '7ff018c1cb43a5fe5ee2049d325cdd785852067a':
  OS/2: Try to commit memory above 1GB

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:21:41 +02:00
Clément Bœsch e5630ce5b1 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>
2017-05-19 11:19:29 +02:00
Clément Bœsch 584366a436 lavc/mpegvideoenc: reformat inv_zigzag_direct16 so the zigzag pattern is visible 2017-05-19 11:17:58 +02:00
Clément Bœsch 19bb2cade5 Merge commit 'b4a911c189962e563a09fb0efaf6fa9ab56263a4'
* commit 'b4a911c189962e563a09fb0efaf6fa9ab56263a4':
  mpegvideoenc: make a table const

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:15:16 +02:00
Clément Bœsch 52a4004d8b Merge commit '296eff4d9dc53d441b672319524a051d04f4a8cf'
* commit '296eff4d9dc53d441b672319524a051d04f4a8cf':
  zmbvenc: get rid of a global table

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:12:24 +02:00
Clément Bœsch 426f5e66a6 Merge commit '00b775dda2b3f78ae60ff3278d3b3d6545883a83'
* commit '00b775dda2b3f78ae60ff3278d3b3d6545883a83':
  hevc: Mark as having threadsafe init

This commit is a noop, see 14b9060160

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:09:20 +02:00
Clément Bœsch 545d14f067 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>
2017-05-19 11:07:46 +02:00
Clément Bœsch 917853661f Merge commit 'fb59f87ce72035b940c3f5045884098b9324e1b2'
* commit 'fb59f87ce72035b940c3f5045884098b9324e1b2':
  nvenc: Explicitly push the cuda context on encoding

This commit is a noop, see be74ba648c

Merged-by: Clément Bœsch <u@pkh.me>
2017-05-19 11:07:03 +02:00
Clément Bœsch aec4812cb3 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>
2017-05-19 11:00:29 +02:00
Clément Bœsch 313264ba24 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>
2017-05-19 10:58:51 +02:00
James Almer 1e8daf31e0 avcodec/hevc_parser: add missing call to ff_hevc_reset_sei()
Signed-off-by: James Almer <jamrial@gmail.com>
2017-05-18 19:55:44 -03:00
Paul B Mahol f5e5c53117 avfilter/af_sofalizer: make lfe gain user configurable
Default settings have it too low.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-05-18 23:13:52 +02:00
Paul B Mahol 79bf4d1450 avfilter/af_sofalizer: avoid casting
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-05-18 22:49:04 +02:00
Michael Niedermayer e434840fd4 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>
2017-05-18 18:08:23 +02:00
Michael Niedermayer a173f484b5 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>
2017-05-18 18:08:23 +02:00
Michael Niedermayer d32ebce8fd 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>
2017-05-18 18:08:23 +02:00
Paul B Mahol 5c9e12bc6d doc/filters: add more ladspa examples
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-05-18 18:01:09 +02:00
Michael Niedermayer 25c81e4b73 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>
2017-05-18 04:08:31 +02:00
Michael Niedermayer 58ac7fb9c3 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>
2017-05-18 04:08:31 +02:00
James Almer 3e295e633c 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>
2017-05-17 22:52:59 -03:00
James Almer 5ff31babfc avformat/movenc: remove experimental check for VP9 streams
The muxer has been updated and is now complaint with the v1.0 of the spec.
2017-05-17 20:52:50 -03:00
Paul B Mahol 6111ac73d9 avfilter/af_afade: fix fading very long durations
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-05-17 22:59:11 +02:00
Mark Thompson b7b02aebec 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>
2017-05-17 19:24:36 +01:00