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

37265 commits

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
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
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
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
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
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
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
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
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
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
Paul B Mahol
fbc1f323db avcodec/xpmdec: rename yet another function 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 23:03:02 +01:00
Paul B Mahol
9d7e71a233 avcodec/xpmdec: rename convert to hex_char_to_number 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 23:03:02 +01:00
Paul B Mahol
7133ab435a avcodec/xpmdec: improve comment for one function and also fix 2 identation issues 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 23:03:02 +01:00
Paul B Mahol
e73325b971 avcodec/xpmdec: skip everything before signature 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 18:24:49 +01:00
Paul B Mahol
01b069c1b8 avcodec/codec_desc: add mime type for X-BitMap 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 18:24:49 +01:00
Paul B Mahol
404d2b977f avcodec/codec_desc: add mime type for X-PixMap 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 18:24:49 +01:00
Paul B Mahol
eda78c8b7f avcodec/xpmdec: make convert function more picky about its input 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 18:24:49 +01:00
Paras Chadha
5dab7b91ad avcodec: add XPM decoder and demuxer 
Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
 2017-03-12 18:24:49 +01:00
Mark Thompson
a7434ef195 Merge commit '8e07c22e50' 
* commit '8e07c22e50':
  qsvenc: print warnings from encode/init

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 15:21:41 +00:00
Mark Thompson
15887a410c Merge commit '95414eb2dc' 
* commit '95414eb2dc':
  qsv: print more complete error messages

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 15:19:05 +00:00
Mark Thompson
723a542d6c Merge commit 'd9ec3c6014' 
* commit 'd9ec3c6014':
  qsvenc: take only the allocated dimensions from the frames context

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 15:06:07 +00:00
Mark Thompson
562f386c77 Merge commit '37a9015ee8' 
* commit '37a9015ee8':
  qsvenc: add support for p010

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 15:04:45 +00:00
Mark Thompson
210dd7bbb2 Merge commit '21962261c7' 
* commit '21962261c7':
  qsv: handle the semi-packed formats in map_fourcc as well

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-12 14:21:37 +00:00
Clément Bœsch
5e193daaa2 Merge commit 'f65285aba0' 
* commit 'f65285aba0':
  lavc: set sw_pix_fmt for hwaccel encoding

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-12 13:21:01 +01:00
Clément Bœsch
8d2d817098 Merge commit 'd59641abfd' 
* commit 'd59641abfd':
  lavc: initialize AVCodecContext.sw_pix_fmt properly

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-12 13:20:57 +01:00
Paul B Mahol
807d5dcde9 avcodec/scpr: use correct linesize for prev frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2017-03-12 12:34:55 +01:00
Michael Niedermayer
ce010655a6 avcodec/dca_xll: Fix runtime error: signed integer overflow: 2147286116 + 6298923 cannot be represented in type 'int' 
Fixes: 732/clusterfuzz-testcase-4872990070145024

See: [FFmpeg-devel] [PATCH 2/6] avcodec/dca_xll: Fix runtime error: signed integer overflow: 2147286116 + 6298923 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-12 04:38:14 +01:00
Michael Niedermayer
44e2105189 avcodec/amrwbdec: Fix runtime error: left shift of negative value -1 
Fixes: 763/clusterfuzz-testcase-6007567320875008

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-12 04:38:14 +01:00
Michael Niedermayer
f4c2302ee2 avcodec/dca_xll: Fix runtime error: signed integer overflow: 1762028192 + 698372290 cannot be represented in type 'int' 
Fixes: 762/clusterfuzz-testcase-5927683747741696

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-12 04:38:14 +01:00
Michael Niedermayer
47cc9c1d77 avcodec/wavpack: Fix runtime error: signed integer overflow: -2147483648 + -83886075 cannot be represented in type 'int' 
Fixes: 761/clusterfuzz-testcase-5442222252097536

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-12 04:38:14 +01:00
Martin Storsjö
26ee83acc4 aarch64: vp9itxfm: Reorder iadst16 coeffs 
This matches the order they are in the 16 bpp version.

There they are in this order, to make sure we access them in the
same order they are declared, easing loading only half of the
coefficients at a time.

This makes the 8 bpp version match the 16 bpp version better.

This is cherrypicked from libav commit
b8f66c0838.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2017-03-11 13:14:52 +02:00
Martin Storsjö
b2e20d8984 arm: vp9itxfm: Reorder iadst16 coeffs 
This matches the order they are in the 16 bpp version.

There they are in this order, to make sure we access them in the
same order they are declared, easing loading only half of the
coefficients at a time.

This makes the 8 bpp version match the 16 bpp version better.

This is cherrypicked from libav commit
08074c092d.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2017-03-11 13:14:52 +02:00