Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-07 18:29:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
86213 commits 38 branches 415 tags 286 MiB
Commit graph

86213 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Niedermayer
ec2b76aab4 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>
 2017-05-21 13:23:22 +02:00
Michael Niedermayer
955db41192 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>
 2017-05-21 13:07:14 +02:00
Michael Niedermayer
3b09d7c264 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>
 2017-05-21 13:06:42 +02:00
Michael Niedermayer
c3547dcbc3 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>
 2017-05-21 02:56:47 +02:00
Michael Niedermayer
d66193252b 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>
 2017-05-21 02:56:47 +02:00
Michael Niedermayer
1d04fc94e1 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>
 2017-05-21 02:56:47 +02:00
Michael Niedermayer
384508b2ff 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>
 2017-05-21 02:31:45 +02:00
Michael Niedermayer
6310fc714d 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>
 2017-05-21 02:31:45 +02:00
James Almer
8794cfbbc5 configure: fix --tempprefix option 
It was broken in 091c986055
 2017-05-20 21:29:58 -03:00
Muhammad Faiz
fc3a03fcf9 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>
 2017-05-20 23:19:46 +07:00
James Almer
f20161d899 avcodec/decode: fix function name 2017-05-20 13:17:12 -03:00
Anton Khirnov
02327d1237 decode: fix the code reducing cropping to preserve alignment 
Currently it does not work at all.

Libav Bug-Id: 1058
(cherry picked from commit 8652a2c248)
 2017-05-20 13:13:10 -03:00
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 'e519dcd937' 
* commit 'e519dcd937':
  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 '1920382aa9' 
* commit '1920382aa9':
  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 'ba6a49e60b' 
* commit 'ba6a49e60b':
  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 '7848982207' 
* commit '7848982207':
  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 '11e225db31' 
* commit '11e225db31':
  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 'ca6ae3b77a' 
* commit 'ca6ae3b77a':
  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 '3c2717e48d' 
* commit '3c2717e48d':
  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 '95f1004bdf' 
* commit '95f1004bdf':
  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 '1ae6cb7d6e' 
* commit '1ae6cb7d6e':
  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 '2bbb5abd87' 
* commit '2bbb5abd87':
  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 '6151e9128c' 
* commit '6151e9128c':
  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 'f96d07f4ec' 
* commit 'f96d07f4ec':
  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 '562ef82d6a' 
* commit '562ef82d6a':
  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 '9bf262f4c6' 
* commit '9bf262f4c6':
  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 'bf38959a30' 
* commit 'bf38959a30':
  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 '381a4e31a6' 
* commit '381a4e31a6':
  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 'b83aea7340' 
* commit 'b83aea7340':
  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 '5c0e2b13eb' 
* commit '5c0e2b13eb':
  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 '7ff018c1cb' 
* commit '7ff018c1cb':
  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 'fd8de7f2d8' 
* commit 'fd8de7f2d8':
  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 'b4a911c189' 
* commit 'b4a911c189':
  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 '296eff4d9d' 
* commit '296eff4d9d':
  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 '00b775dda2' 
* commit '00b775dda2':
  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 '54dcd22885' 
* commit '54dcd22885':
  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 'fb59f87ce7' 
* commit 'fb59f87ce7':
  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 '4795e4f61f' 
* commit '4795e4f61f':
  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 '44129e3804' 
* commit '44129e3804':
  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