wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
83950 commits 40 branches 405 tags 230 MiB
Commit graph

83950 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Niedermayer
cfa10e11be avcodec/tiff: Check palette shift 
Fixes multiple  runtime error: shift exponent 792 is too large for 32-bit type 'unsigned int'

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-16 01:04:35 +01:00
Michael Niedermayer
58e9c7f4a2 avcodec/wavpack: Fix multiple integer overflows 
Fixes: 839/clusterfuzz-testcase-4871084446842880

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-16 01:04:35 +01:00
Michael Niedermayer
45198477de avcodec/simple_idct_template: Fix several integer overflows 
Benchmarks with START_TIMER indicate that the code is faster with unsigned, (that is
with the patch), there was quite some fluctuation in the numbers so this may be just
random

Fixes: 811/clusterfuzz-testcase-6465493076541440

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-16 01:04:35 +01:00
Ricardo Constantino
b409d8d4a2 configure: libnpp is always nonfree, even with LGPL 
libnpp was erroneously grouped up with libfdk-aac and openssl to check
if --enable-nonfree wasn't passed only with --enable-gpl in
9f28db47ac. The latter two are compatible
with LGPL, libnpp is not.

Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-15 19:53:12 -03:00
Clément Bœsch
d96f6df3a6 Merge commit '7ebdffc353' 
* commit '7ebdffc353':
  dxv: Check to make sure we don't overrun buffers on corrupt inputs

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 23:26:10 +01:00
Clément Bœsch
aabe525734 Merge commit 'e328178da9' 
* commit 'e328178da9':
  qsvdec: only access hwaccel_context is the pixel format is QSV

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 23:22:50 +01:00
Clément Bœsch
e887d685f7 Merge commit 'ed1cd81076' 
* commit 'ed1cd81076':
  flac demuxer: improve probing

Suggested commit very closely matches our code, except with regards to
AVPROBE_SCORE_EXTENSION. The code layout is mostly merged but preserves
our behaviour.

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 23:17:32 +01:00
Clément Bœsch
dd0abace3e Merge commit '5ebef79abe' 
* commit '5ebef79abe':
  Fix instances of broken indentation found by gcc 6

Noop, see 21d3f0c02, 6089c44a2

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 23:00:50 +01:00
Clément Bœsch
2f6661c940 doc: remove remaining legacy x11grab references 2017-03-15 22:23:00 +01:00
Clément Bœsch
f6d61eb6f9 Merge commit '5ed4644d6d' 
* commit '5ed4644d6d':
  x11grab: Rename internal component to "xcbgrab"

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 22:19:56 +01:00
Clément Bœsch
4a9c5f6bc5 Merge commit '4fef648d10' 
* commit '4fef648d10':
  Remove the legacy X11 screen grabber

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 22:07:47 +01:00
Clément Bœsch
4ac44520e5 Merge commit '8495d84f01' 
* commit '8495d84f01':
  ac3dec: Add some inline hints

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 21:58:13 +01:00
Clément Bœsch
151b5e4a53 Merge commit '3db51bf671' 
* commit '3db51bf671':
  ac3dec: Simplify skipping

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 21:57:57 +01:00
Clément Bœsch
2e3221c303 Merge commit 'f0ccc65bc9' 
* commit 'f0ccc65bc9':
  ac3dec: Split coupling-specific code from decode_audio_block()

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 21:56:47 +01:00
Clément Bœsch
7c4dbd1df9 Merge commit 'a5ebe5d121' 
* commit 'a5ebe5d121':
  ac3dec: Split spx-specific code from decode_audio_block()

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 21:43:59 +01:00
Clément Bœsch
8636ccb5c0 Merge commit '2ac00d2d1d' 
* commit '2ac00d2d1d':
  mov: Validate the ID number

This commit is a noop as the modified check is not present in FFmpeg.
See d30870cc73.

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 21:29:56 +01:00
Clément Bœsch
e40fd81809 Merge commit 'a115eb9e75' 
* commit 'a115eb9e75':
  mimic: do not release the newly obsolete reference at the end of decoding

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 21:23:30 +01:00
Clément Bœsch
9f28db47ac Merge commit 'ae90119c67' 
* commit 'ae90119c67':
  configure: Simplify license incompatibility check

An extra GPLV3 list is added for libsmbclient as having it in both GPL
and VERSION3 lists would cause a duplicate in the final config list.

Also, for consistency, libnpp is treated the same as the other nonfree
component (libfdk_aac and openssl).

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-15 21:19:57 +01:00
Steven Liu
0052f3f527 avcodec/videotoolboxenc: add rc_max_bitrate control into videotoolbox 
add kVTCompressionPropertyKey_DataRateLimits support by rc_max_bitrate

Reviewed-by: Rick Kern <kernrj@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-03-15 09:37:25 -04:00
Clément Bœsch
a283665693 Merge commit 'e46a6fb773' 
* commit 'e46a6fb773':
  avconv: Check that muxing_queue exists before reading from it

Mostly noop. This was fixed in FFmpeg in 7f7c494a3.

The merge makes the cosmetics match but does not include the weird
av_log().

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-15 14:28:43 +01:00
Clément Bœsch
67e2ba36ec Merge commit '100fb0ddfd' 
* commit '100fb0ddfd':
  configure: Allow detecting and using LLVM lld-link as linker for windows

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-15 12:50:04 +01:00
Clément Bœsch
50d303a66a Merge commit '79fb069299' 
* commit '79fb069299':
  configure: Move defines for controlling MSVCRT headers to the CRT detection section

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-15 12:44:35 +01:00
Clément Bœsch
132523448b Merge commit '56af0bc10f' 
* commit '56af0bc10f':
  configure: Check for strtoll and redirect to _strtoi64 in the msvcrt block

Also includes _strtoui64 in the check.

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-15 12:39:34 +01:00
Clément Bœsch
6426c58b1c Merge commit '48b80f8393' 
* commit '48b80f8393':
  hpeldsp: Explain why put_no_rnd_pixels_tab is larger than necessary

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-15 12:34:51 +01:00
Clément Bœsch
8b13492c9e Merge commit '40ad05bab2' 
* commit '40ad05bab2':
  checkasm: Cast unsigned to signed

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-15 12:32:15 +01:00
Clément Bœsch
89a032634b Merge commit 'b183abfb5b' 
* commit 'b183abfb5b':
  vpx: Support color range

Decoder chunk not merged as the framework automatically copies avctx
color range to the frame color range. And we already set the avctx field
since cbcc88c039.

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-15 12:23:18 +01:00
Matthieu Bouron
1ade4d87ba lavc/h264dec: use OFFSET macro 2017-03-15 11:46:15 +01:00
Steven Liu
e90ad88281 avformat/hlsenc: fix duration wrong when no pkt duration 
when cannot get pkt duration, hlsenc segments duration will
be set to 0, this patch can fix it.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-03-15 07:37:11 +08:00
wm4
55eab1733b ffmpeg, ffprobe: don't "merge" side data into packet data by default 
Preparation for potentially disabling merged side data by default in the
libs. Do this in particular because it affects fate tests.

The changed tests either reflect added packet side data, or the changed
packet size due to merged side data removal reducing the packet size.
 2017-03-14 23:37:28 +01:00
Alexander Strasser
a70d5e2593 lavf/avio: Be more explicit in logging white/black list matches 
The current form of the messages indicating matches in the white
or black lists seems to be a bit too much relying on context.

Make the messages more explicit.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2017-03-14 22:58:53 +01:00
Alexander Strasser
6693d57e99 lavf/avio: Remove unnecessary escaping of ' in string literals 
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2017-03-14 22:58:53 +01:00
Michael Niedermayer
8ebed703f1 avcodec/mpegaudiodec_template: Make l3_unscale() work with e=0 
Fixes undefined behavior
Fixes: 830/clusterfuzz-testcase-6253175327686656

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-14 22:48:49 +01:00
Michael Niedermayer
108b02e547 avcodec/tiff: Check for multiple geo key directories 
Fixes memleak
Fixes: 826/clusterfuzz-testcase-5316921379520512

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-14 22:48:49 +01:00
Michael Niedermayer
0728d9a281 avcodec/pictordec: Fix runtime error: left shift of 805306368 by 2 places cannot be represented in type 'int' 
Fixes: 823/clusterfuzz-testcase-6727060074528768

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-14 22:48:49 +01:00
Katherine Nagels
b2206475b4 doc/filters: Add colourspace values for colormatrix filter 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Kieran Kunhya <kierank@obe.tv>
 2017-03-14 13:35:38 -08:00
Steven Liu
4e3cc4bdd8 avformat/flvenc: flx flvflags no_metadata bug 
When use flvflags no_metadata , the FLV header will be cover by write tailer
This commit fix the bug

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-03-14 18:11:20 +08:00
Steven Liu
d3ce067e76 avformat/hlsenc: fix ticket 6231 
check if the hls_flags is byterange_mode and check if should close fd

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-03-14 10:16:00 +08:00
Michael Niedermayer
7cebc5a9cc avcodec/wavpack: Fix runtime error: shift exponent 32 is too large for 32-bit type 'int' 
Fixes: 822/clusterfuzz-testcase-4873433189974016

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-14 02:23:50 +01:00
Michael Niedermayer
acdacb108d avcodec/targa: Skip hflip on blank images 
Fixes: timeout with 810/clusterfuzz-testcase-5249282825256960

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-14 02:23:50 +01:00
Michael Niedermayer
1467143a6e avcodec/wavpack: Fix runtime error: shift exponent 137 is too large for 32-bit type 'int' 
Fixes: 808/clusterfuzz-testcase-4715513349406720

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-14 02:23:50 +01:00
Michael Niedermayer
a557ae8d52 avcodec/h264_direct: Fix runtime error: signed integer overflow: 2147483647 - -14133 cannot be represented in type 'int' 
Fixes: 755/clusterfuzz-testcase-5369072516595712

See: [FFmpeg-devel] [PATCH 1/2] avcodec/h264_direct: Fix runtime error: signed integer overflow: 2147483647 - -14133 cannot be represented in type 'int'

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-14 02:23:50 +01:00
Paul B Mahol
fbfbd97be2 avcodec/xpmdec: there are XPM files with dos line endings 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-13 20:40:41 +01:00
Paul B Mahol
62c8dc4642 avfilter/vf_lut3d: actually skip lines when encountering DOMAIN_ string 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-13 15:30:05 +01:00
Steven Liu
33e997d992 avformat/hlsenc: second_levels flags process function extract 
the SECOND_LEVEL* flags process and name is too long
extract all of them output to funtions, make code clear

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-03-13 11:58:34 +08:00
Michael Niedermayer
967feea5eb avcodec/vp6: clear dimensions on failed resolution change in vp6_parse_header() 
Fixes: 807/clusterfuzz-testcase-6470061042696192
Fixes null pointer dereference

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-13 04:48:43 +01:00
Michael Niedermayer
a66c6e28b5 avcodec/rv34: Fix runtime error: signed integer overflow: 36880 * 66288 cannot be represented in type 'int' 
Fixes: 768/clusterfuzz-testcase-4807444305805312

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-13 04:48:43 +01:00
Michael Niedermayer
a720b854b0 avcodec/mpeg12dec: Fix runtime error: left shift of negative value -1 
Fixes: 764/clusterfuzz-testcase-6273034652483584

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-13 04:48:43 +01:00
Paul B Mahol
58f0bbc1ea avcodec/xpmdec: avoid "magic" numbers in function hex_char_to_number() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 23:03:02 +01:00
Paul B Mahol
dd0090eb21 avcodec/xpmdec: fix colors values which are different for X11 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 23:03:02 +01:00
Paul B Mahol
2b790b1c9e avcodec/xpmdec: do not allow number of colors to be higher than allocated 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 23:03:02 +01:00