ffmpeg.git
2 years agoavcodec/htmlsubtitles: Check for string truncation and return error
Michael Niedermayer [Fri, 5 May 2017 23:42:53 +0000 (01:42 +0200)]
avcodec/htmlsubtitles: Check for string truncation and return error

Fixes out of array access
Fixes: 1354/clusterfuzz-testcase-minimized-5520132195483648

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/wavpack: Fix signed integer overflow: 1285114081 * 2 cannot be represented...
Michael Niedermayer [Thu, 4 May 2017 21:41:28 +0000 (23:41 +0200)]
avcodec/wavpack: Fix signed integer overflow: 1285114081 * 2 cannot be represented in type 'int'

Fixes: 945/clusterfuzz-testcase-6037937588273152
Fixes: integer overflow

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mjpegenc: move ff_mjpeg_encode_picture_frame to mjpegenc_common
James Almer [Mon, 8 May 2017 14:33:57 +0000 (11:33 -0300)]
avcodec/mjpegenc: move ff_mjpeg_encode_picture_frame to mjpegenc_common

Fixes compilation of ljpeg encoder if mjpeg and amv encoders are disabled

2 years agoconfigure: add missing lpc dependency to mlp and truehd encoders
James Almer [Mon, 8 May 2017 14:24:48 +0000 (11:24 -0300)]
configure: add missing lpc dependency to mlp and truehd encoders

2 years agoavcodec/bmvvideo: Fix runtime error: left shift of 137 by 24 places cannot be represe...
Michael Niedermayer [Mon, 8 May 2017 13:46:55 +0000 (15:46 +0200)]
avcodec/bmvvideo: Fix runtime error: left shift of 137 by 24 places cannot be represented in type 'int'

Fixes: 1411/clusterfuzz-testcase-minimized-5776085184675840

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/dss_sp: Fix multiple runtime error: signed integer overflow: -15699 * -164039...
Michael Niedermayer [Mon, 8 May 2017 13:40:30 +0000 (15:40 +0200)]
avcodec/dss_sp: Fix multiple runtime error: signed integer overflow: -15699 * -164039 cannot be represented in type 'int'

Fixed: 1409/clusterfuzz-testcase-minimized-5237365020819456

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/dvbsubdec: check region dimensions
Michael Niedermayer [Mon, 8 May 2017 13:17:31 +0000 (15:17 +0200)]
avcodec/dvbsubdec: check region dimensions

Fixes: 1408/clusterfuzz-testcase-minimized-6529985844084736
Fixes: integer overflow

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/vp8dsp: Fixes: runtime error: signed integer overflow: 1330143360 - -10230405...
Michael Niedermayer [Mon, 8 May 2017 10:07:56 +0000 (12:07 +0200)]
avcodec/vp8dsp: Fixes: runtime error: signed integer overflow: 1330143360 - -1023040530 cannot be represented in type 'int'

Fixes: 1406/clusterfuzz-testcase-minimized-5064865125236736

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/hqxdsp: Fix multiple runtime error: signed integer overflow: 248220 * 21407...
Michael Niedermayer [Mon, 8 May 2017 10:04:09 +0000 (12:04 +0200)]
avcodec/hqxdsp: Fix multiple runtime error: signed integer overflow: 248220 * 21407 cannot be represented in type 'int' in idct_col()

Fixes: 1405/clusterfuzz-testcase-minimized-5011491835084800

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/cavsdec: Check sym_factor
Michael Niedermayer [Mon, 8 May 2017 09:55:27 +0000 (11:55 +0200)]
avcodec/cavsdec: Check sym_factor

Fixes: runtime error: signed integer overflow: 25984 * 130560 cannot be represented in type 'int'

Fixes: 1404/clusterfuzz-testcase-minimized-5000441286885376

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/cdxl: Check format for BGR24
Michael Niedermayer [Mon, 8 May 2017 09:46:03 +0000 (11:46 +0200)]
avcodec/cdxl: Check format for BGR24

Fixes: out of array access
Fixes: 1427/clusterfuzz-testcase-minimized-5020737339392000

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agotests/fate/fifo-muxer: update fifo-muxer dependencies
Tobias Rapp [Thu, 4 May 2017 13:21:03 +0000 (15:21 +0200)]
tests/fate/fifo-muxer: update fifo-muxer dependencies

Fixes fate when configured with --disable-network.

2 years agoavcodec/dcaenc: Initial implementation of ADPCM encoding for DCA encoder
Daniil Cherednik [Mon, 20 Feb 2017 23:22:51 +0000 (23:22 +0000)]
avcodec/dcaenc: Initial implementation of ADPCM encoding for DCA encoder

2 years agoavcodec/rangecoder: Test for invalid corner case
Michael Niedermayer [Mon, 8 May 2017 00:58:54 +0000 (02:58 +0200)]
avcodec/rangecoder: Test for invalid corner case

Fixes runtime error: left shift of 1912602815 by 8 places cannot be represented in type 'int'
Fixes: 1403/clusterfuzz-testcase-minimized-4724820484816896

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/ffv1dec: Fix copying planes of paletted formats
Michael Niedermayer [Mon, 8 May 2017 00:28:07 +0000 (02:28 +0200)]
avcodec/ffv1dec: Fix copying planes of paletted formats

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/wmv2dsp: Fix runtime error: signed integer overflow: 181 * -12156865 cannot...
Michael Niedermayer [Sun, 7 May 2017 21:07:42 +0000 (23:07 +0200)]
avcodec/wmv2dsp: Fix runtime error: signed integer overflow: 181 * -12156865 cannot be represented in type 'int'

Fixes: 1401/clusterfuzz-testcase-minimized-6526248148795392

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodoc: fix bistream typo
Michael Niedermayer [Sun, 7 May 2017 20:37:15 +0000 (22:37 +0200)]
doc: fix bistream typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffprobe: make function replacement macros behave correctly
Michael Niedermayer [Sun, 7 May 2017 20:30:59 +0000 (22:30 +0200)]
ffprobe: make function replacement macros behave correctly

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavfi/avfiltergraph: only return EOF in avfilter_graph_request_oldest if all sinks...
Marton Balint [Fri, 5 May 2017 23:12:24 +0000 (01:12 +0200)]
lavfi/avfiltergraph: only return EOF in avfilter_graph_request_oldest if all sinks EOFed

Fixes a regression introduced in 32c59a115d3cc757676b5384a5ea44b5a7a7b872,
becoming effective in 912969a33e313c57c906e87a7e2367b78a2160f4.

Fixes trimmed output of
ffmpeg -f lavfi -i "sine=d=0.01" -f lavfi -i "sine=d=1" -filter_complex "[0:a]anull[a1];[1:a]anull[a2]" -map "[a1]" -f null none -map "[a2]" -f framecrc -

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoavcodec/xwddec: Check bpp more completely
Michael Niedermayer [Sun, 7 May 2017 16:50:49 +0000 (18:50 +0200)]
avcodec/xwddec: Check bpp more completely

Fixes out of array access
Fixes: 1399/clusterfuzz-testcase-minimized-4866094172995584

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/aacdec_template: Do not decode 2nd PCE if it will lead to failure
Michael Niedermayer [Mon, 10 Apr 2017 00:46:25 +0000 (02:46 +0200)]
avcodec/aacdec_template: Do not decode 2nd PCE if it will lead to failure

Fixes: out of array read
Fixes: 1072/clusterfuzz-testcase-6456688074817536
Fixes: 1398/clusterfuzz-testcase-minimized-4576913622302720

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/s302m: Fix left shift of 8 by 28 places cannot be represented in type 'int'
Michael Niedermayer [Sun, 7 May 2017 13:44:51 +0000 (15:44 +0200)]
avcodec/s302m: Fix left shift of 8 by 28 places cannot be represented in type 'int'

Fixes: 1395/clusterfuzz-testcase-minimized-5330939741732864

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

Fixes: 1394/clusterfuzz-testcase-minimized-6493376885030912

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

Fixes: 1393/clusterfuzz-testcase-minimized-5948366791901184

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agobuild: Ignore generated .version files
Diego Biurrun [Tue, 31 Jan 2017 14:46:50 +0000 (15:46 +0100)]
build: Ignore generated .version files

(cherry picked from commit 740b0bf03b4bb8b0a0e964750817ac0363a33c55)
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/magicyuv: Check len to be supported
Michael Niedermayer [Sun, 7 May 2017 12:53:31 +0000 (14:53 +0200)]
avcodec/magicyuv: Check len to be supported

Fixes: shift exponent -1 is negative
Fixes: 1390/clusterfuzz-testcase-minimized-5452757630713856

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

Fixes: 1388/clusterfuzz-testcase-minimized-6680800936329216

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mss34dsp: Fix multiple signed integer overflow
Michael Niedermayer [Sun, 7 May 2017 12:12:04 +0000 (14:12 +0200)]
avcodec/mss34dsp: Fix multiple signed integer overflow

Fixes: 1387/clusterfuzz-testcase-minimized-4802757766676480

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/nvenc: use frames hwctx when registering a frame
Timo Rothenpieler [Sun, 7 May 2017 11:38:30 +0000 (13:38 +0200)]
avcodec/nvenc: use frames hwctx when registering a frame

2 years agoavcodec/nvenc: support external context in sw mode
Timo Rothenpieler [Sun, 7 May 2017 11:35:25 +0000 (13:35 +0200)]
avcodec/nvenc: support external context in sw mode

2 years agoavformat/matroskadec: fix resource leak
Steven Liu [Sun, 7 May 2017 03:29:08 +0000 (11:29 +0800)]
avformat/matroskadec: fix resource leak

Fixes Coverity CID: 1405453

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2 years agoconfigure: add missing avcodec dependencies to filters
James Almer [Sun, 7 May 2017 02:52:38 +0000 (23:52 -0300)]
configure: add missing avcodec dependencies to filters

2 years agoavcodec/targa_y216dec: Fix width type
Michael Niedermayer [Sun, 7 May 2017 01:49:06 +0000 (03:49 +0200)]
avcodec/targa_y216dec: Fix width type

Fixes out of array access
Fixes: 1376/clusterfuzz-testcase-minimized-6361794975105024

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/texturedsp: Fix multiple runtime error: left shift of 255 by 24 places cannot...
Michael Niedermayer [Sun, 7 May 2017 01:27:17 +0000 (03:27 +0200)]
avcodec/texturedsp: Fix multiple runtime error: left shift of 255 by 24 places cannot be represented in type 'int'

Fixes: 1386/clusterfuzz-testcase-minimized-5323086394032128

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/ivi_dsp: Fix multiple left shift of negative value -2
Michael Niedermayer [Sun, 7 May 2017 01:23:09 +0000 (03:23 +0200)]
avcodec/ivi_dsp: Fix multiple left shift of negative value -2

Fixes: 1385/clusterfuzz-testcase-minimized-5552882663292928

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/svq3: Fix multiple runtime error: signed integer overflow: 44161 * 61694...
Michael Niedermayer [Sun, 7 May 2017 01:16:53 +0000 (03:16 +0200)]
avcodec/svq3: Fix multiple runtime error: signed integer overflow: 44161 * 61694 cannot be represented in type 'int'

Fixes: 1382/clusterfuzz-testcase-minimized-6013445293998080

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/msmpeg4dec: Correct table depth
Michael Niedermayer [Sun, 7 May 2017 00:46:54 +0000 (02:46 +0200)]
avcodec/msmpeg4dec: Correct table depth

Fixes undefined shift
Fixes: 1381/clusterfuzz-testcase-minimized-5513944540119040

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/hevc_sei: actually propagate error codes
James Almer [Sun, 7 May 2017 01:57:43 +0000 (22:57 -0300)]
avcodec/hevc_sei: actually propagate error codes

2 years agortmpproto: send swfverify value as swfurl if latter is unused
Ricardo Constantino [Mon, 20 Mar 2017 20:22:51 +0000 (20:22 +0000)]
rtmpproto: send swfverify value as swfurl if latter is unused

Replicates lavf/librtmp.c behavior in L149-156 and rtmpdump's
behavior with "--swfVfy <url>" passing the url to swfUrl.

Fixes trac ticket #5549.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavdevice/alsa: wait until playback buffers are drained before closing
Takayuki 'January June' Suwa [Sat, 6 May 2017 11:42:56 +0000 (20:42 +0900)]
avdevice/alsa: wait until playback buffers are drained before closing

This fixes early abort on ALSA playback

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/dds: Fix runtime error: left shift of 1 by 31 places cannot be represented...
Michael Niedermayer [Sat, 6 May 2017 20:31:23 +0000 (22:31 +0200)]
avcodec/dds: Fix runtime error: left shift of 1 by 31 places cannot be represented in type 'int'

Fixes: 1380/clusterfuzz-testcase-minimized-650122545122508

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/cdxl: Check format parameter
Michael Niedermayer [Sat, 6 May 2017 20:24:52 +0000 (22:24 +0200)]
avcodec/cdxl: Check format parameter

Fixes out of array access
Fixes: 1378/clusterfuzz-testcase-minimized-5715088008806400

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavutil/softfloat: Fix overflow in av_div_sf()
Michael Niedermayer [Sat, 6 May 2017 19:31:49 +0000 (21:31 +0200)]
avutil/softfloat: Fix overflow in av_div_sf()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/utils: free AVStream.codec properly in free_stream()
Aaron Levinson [Fri, 21 Apr 2017 06:30:13 +0000 (23:30 -0700)]
avformat/utils: free AVStream.codec properly in free_stream()

Fixes memory leaks.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/shorten: Check residual size
Michael Niedermayer [Sat, 6 May 2017 17:53:25 +0000 (19:53 +0200)]
avcodec/shorten: Check residual size

Fixes assertion failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/hq_hqa: Fix runtime error: left shift of negative value -207
Michael Niedermayer [Sat, 6 May 2017 17:11:46 +0000 (19:11 +0200)]
avcodec/hq_hqa: Fix runtime error: left shift of negative value -207

Fixes: 1375/clusterfuzz-testcase-minimized-6070134701555712

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mss3: Change types in rac_get_model_sym() to match the types they are initial...
Michael Niedermayer [Sat, 6 May 2017 17:07:59 +0000 (19:07 +0200)]
avcodec/mss3: Change types in rac_get_model_sym() to match the types they are initialized from

Fixes integer overflow
Fixes: 1372/clusterfuzz-testcase-minimized-5712192982745088

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/shorten: Check k in get_uint()
Michael Niedermayer [Sat, 6 May 2017 16:28:09 +0000 (18:28 +0200)]
avcodec/shorten: Check k in get_uint()

Fixes: undefined shift
Fixes: 1371/clusterfuzz-testcase-minimized-5770822591447040

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/golomb: Assert that k is valid in get_ur_golomb_jpegls()
Michael Niedermayer [Sat, 6 May 2017 16:25:02 +0000 (18:25 +0200)]
avcodec/golomb: Assert that k is valid in get_ur_golomb_jpegls()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/webp: Fix null pointer dereference
Michael Niedermayer [Sat, 6 May 2017 14:43:52 +0000 (16:43 +0200)]
avcodec/webp: Fix null pointer dereference

Fixes: 1369/clusterfuzz-testcase-minimized-5048908029886464

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/dfa: Fix signed integer overflow: -2147483648 - 1 cannot be represented in...
Michael Niedermayer [Sat, 6 May 2017 14:38:22 +0000 (16:38 +0200)]
avcodec/dfa: Fix signed integer overflow: -2147483648 - 1 cannot be represented in type 'int'

Fixes: 1368/clusterfuzz-testcase-minimized-4507293276176384

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/g723_1: Fix multiple runtime error: left shift of negative value
Michael Niedermayer [Sat, 6 May 2017 14:32:56 +0000 (16:32 +0200)]
avcodec/g723_1: Fix multiple runtime error: left shift of negative value

Fixes: 1367/clusterfuzz-testcase-minimized-571496882346393

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mimic: Fix runtime error: left shift of negative value -1
Michael Niedermayer [Sat, 6 May 2017 13:17:29 +0000 (15:17 +0200)]
avcodec/mimic: Fix runtime error: left shift of negative value -1

Fixes: 1365/clusterfuzz-testcase-minimized-5624158450876416

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agotools/target_dec_fuzzer: Do not attempt to fuzz VDPAU, its not supported
Michael Niedermayer [Sat, 6 May 2017 13:13:05 +0000 (15:13 +0200)]
tools/target_dec_fuzzer: Do not attempt to fuzz VDPAU, its not supported

Fixes: 1364/clusterfuzz-testcase-minimized-6459843441328128
Fixes: 1392

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agotools/target_dec_fuzzer: Do not use codec_id to look up decoder, but use selected...
Michael Niedermayer [Sat, 6 May 2017 13:12:05 +0000 (15:12 +0200)]
tools/target_dec_fuzzer: Do not use codec_id to look up decoder, but use selected decoder directly

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/opus_silk: Fix integer overflow and out of array read
Michael Niedermayer [Sat, 6 May 2017 12:28:20 +0000 (14:28 +0200)]
avcodec/opus_silk: Fix integer overflow and out of array read

Fixes: 1362/clusterfuzz-testcase-minimized-6097275002552320

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/clearvideo: Fix multiple runtime error: left shift of negative value -1024
Michael Niedermayer [Sat, 6 May 2017 10:17:01 +0000 (12:17 +0200)]
avcodec/clearvideo: Fix multiple runtime error: left shift of negative value -1024

Fixes: 1360/clusterfuzz-testcase-minimized-5606472043986944

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

Fixes: 1356/clusterfuzz-testcase-minimized-6008489086287872

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mlpdec: Fix runtime error: left shift of negative value -22
Michael Niedermayer [Sat, 6 May 2017 10:05:17 +0000 (12:05 +0200)]
avcodec/mlpdec: Fix runtime error: left shift of negative value -22

Fixes: 1355/clusterfuzz-testcase-minimized-6662205472768000

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec: Avoid splitting side data repeatedly
Michael Niedermayer [Thu, 4 May 2017 15:15:18 +0000 (17:15 +0200)]
avcodec: Avoid splitting side data repeatedly

Fixes Timeout
Fixes: 508/clusterfuzz-testcase-6245747678773248

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/snowdec: Check qbias
Michael Niedermayer [Fri, 5 May 2017 23:08:54 +0000 (01:08 +0200)]
avcodec/snowdec: Check qbias

Fixes: signed integer overflow: -1094995529 * 131 cannot be represented in type 'int'
Fixes: 1353/clusterfuzz-testcase-minimized-5208180449607680

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/hevc_parser: cosmetics
James Almer [Fri, 5 May 2017 23:02:30 +0000 (20:02 -0300)]
avcodec/hevc_parser: cosmetics

Reduces differences with libav slightly.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc_parser: move hevc_find_frame_end() down in the file
James Almer [Fri, 5 May 2017 22:26:56 +0000 (19:26 -0300)]
avcodec/hevc_parser: move hevc_find_frame_end() down in the file

Reduces differences with libav.

2 years agoavutil/softfloat: Fix multiple runtime error: left shift of negative value -8
Michael Niedermayer [Fri, 5 May 2017 22:13:05 +0000 (00:13 +0200)]
avutil/softfloat: Fix multiple runtime error: left shift of negative value -8

Fixes: 1352/clusterfuzz-testcase-minimized-5757565017260032

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/ivi: Free custom blk_vlc
Michael Niedermayer [Fri, 5 May 2017 22:08:38 +0000 (00:08 +0200)]
avcodec/ivi: Free custom blk_vlc

Fixes memleak
Fixes: 1351/clusterfuzz-testcase-minimized-5861971645693952

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/aacsbr_template: Do not leave bs_num_env invalid
Michael Niedermayer [Fri, 5 May 2017 21:00:59 +0000 (23:00 +0200)]
avcodec/aacsbr_template: Do not leave bs_num_env invalid

Fixes out of array read
Fixes: 1349/clusterfuzz-testcase-minimized-5370707196248064

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mdec: Fix signed integer overflow: 28835400 * 83 cannot be represented in...
Michael Niedermayer [Fri, 5 May 2017 20:17:59 +0000 (22:17 +0200)]
avcodec/mdec: Fix signed integer overflow: 28835400 * 83 cannot be represented in type 'int'

Fixes: 1346/clusterfuzz-testcase-minimized-5776732600664064

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodoc/libav_merge: remove line about ADVANCED_PARSER
James Almer [Sun, 30 Apr 2017 20:17:34 +0000 (17:17 -0300)]
doc/libav_merge: remove line about ADVANCED_PARSER

It's been addressed.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc_parse: decode SEI message NALUs in extradata
James Almer [Sun, 30 Apr 2017 16:05:52 +0000 (13:05 -0300)]
avcodec/hevc_parse: decode SEI message NALUs in extradata

They may be available in hvcc style extradata.

Based on a patch by Hendrik Leppkes.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc_parser: move slice header parsing to its own function
James Almer [Mon, 1 May 2017 17:32:07 +0000 (14:32 -0300)]
avcodec/hevc_parser: move slice header parsing to its own function

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc_parser: remove HEVCContext usage
James Almer [Sun, 30 Apr 2017 19:57:41 +0000 (16:57 -0300)]
avcodec/hevc_parser: remove HEVCContext usage

This gets rid of the duplicate, limited parser.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevc_parser: use ff_h2645_packet_split() to parse NAL units
James Almer [Sun, 30 Apr 2017 16:48:22 +0000 (13:48 -0300)]
avcodec/hevc_parser: use ff_h2645_packet_split() to parse NAL units

This simplifies the code considerably.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevcdec: move SliceHeader struct definition to hevc_ps
James Almer [Sun, 30 Apr 2017 19:52:51 +0000 (16:52 -0300)]
avcodec/hevcdec: move SliceHeader struct definition to hevc_ps

This is in preparation for a following patch.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevcdec: remove HEVCContext usage from ff_hevc_compute_poc()
James Almer [Sun, 30 Apr 2017 19:49:41 +0000 (16:49 -0300)]
avcodec/hevcdec: remove HEVCContext usage from ff_hevc_compute_poc()

Move it to hevc_ps as well. This is in preparation for a following patch.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevcdec: move SEI message parsing into a separate header
James Almer [Sun, 30 Apr 2017 14:34:06 +0000 (11:34 -0300)]
avcodec/hevcdec: move SEI message parsing into a separate header

It doesn't depend on hevcdec anymore.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/hevcdec: remove HEVCContext usage from hevc_sei
James Almer [Sun, 30 Apr 2017 01:01:03 +0000 (22:01 -0300)]
avcodec/hevcdec: remove HEVCContext usage from hevc_sei

Based on the H264 SEI implementation.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/dfa: Fix off by 1 error
Michael Niedermayer [Fri, 5 May 2017 18:42:11 +0000 (20:42 +0200)]
avcodec/dfa: Fix off by 1 error

Fixes out of array access
Fixes: 1345/clusterfuzz-testcase-minimized-6062963045695488

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/nellymoser: Fix multiple left shift of negative value -8591
Michael Niedermayer [Fri, 5 May 2017 17:28:56 +0000 (19:28 +0200)]
avcodec/nellymoser: Fix multiple left shift of negative value -8591

Fixes: 1342/clusterfuzz-testcase-minimized-5490842129137664

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/cdxl: Fix signed integer overflow: 14243456 * 164 cannot be represented in...
Michael Niedermayer [Fri, 5 May 2017 17:26:02 +0000 (19:26 +0200)]
avcodec/cdxl: Fix signed integer overflow: 14243456 * 164 cannot be represented in type 'int'

Fixes: 1341/clusterfuzz-testcase-minimized-5441502618583040

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/g722: Fix multiple runtime error: left shift of negative value -1
Michael Niedermayer [Fri, 5 May 2017 16:14:03 +0000 (18:14 +0200)]
avcodec/g722: Fix multiple runtime error: left shift of negative value -1

Fixes: 1340/clusterfuzz-testcase-minimized-4669892148068352

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/dss_sp: Fix multiple left shift of negative value -466
Michael Niedermayer [Fri, 5 May 2017 16:07:25 +0000 (18:07 +0200)]
avcodec/dss_sp: Fix multiple left shift of negative value -466

Fixes: 1339/clusterfuzz-testcase-minimized-4614671485108224

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/wnv1: Fix runtime error: left shift of negative value -1
Michael Niedermayer [Fri, 5 May 2017 16:01:25 +0000 (18:01 +0200)]
avcodec/wnv1: Fix runtime error: left shift of negative value -1

Fixes: 1338/clusterfuzz-testcase-minimized-6485546354343936

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

* commit 'b68e353136db6f963212c457281d9716516cdc59':
  qsvdec: do not sync PIX_FMT_QSV surfaces

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa'
Clément Bœsch [Fri, 5 May 2017 12:09:34 +0000 (14:09 +0200)]
Merge commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa'

* commit 'ac3c3ee678e51b05a2a7c30ce79465db46ba01fa':
  dxva2: allow an empty array of ID3D11VideoDecoderOutputView

This commit is a noop, see 8fb48659018f17827c2d5a3ba72263f421fdfa2d

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60'
Clément Bœsch [Fri, 5 May 2017 12:08:12 +0000 (14:08 +0200)]
Merge commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60'

* commit 'f67235a28cef44fcd97ae74ad53bbbc0d7f63d60':
  dxva2: get the slice number directly from the surface in D3D11VA

This commit is a noop, see 153b36fc62849e0e1540a43829794e0503994ebb

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'
Clément Bœsch [Fri, 5 May 2017 11:53:11 +0000 (13:53 +0200)]
Merge commit '122de16dd8108a59a55d30543c9f28b5f61b02d1'

* commit '122de16dd8108a59a55d30543c9f28b5f61b02d1':
  Replace cmdutils_common_opts.h by a macro

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '2a2889e130fee6d3c11e506328388afb317626ed'
Clément Bœsch [Fri, 5 May 2017 11:43:18 +0000 (13:43 +0200)]
Merge commit '2a2889e130fee6d3c11e506328388afb317626ed'

* commit '2a2889e130fee6d3c11e506328388afb317626ed':
  build: Remove stray duplicate conditional variable declaration

This commit is a noop, there is no duplicate in FFmpeg. we have the
tools rules kept in the root Makefile though (see
802d94c36edcd05b53a56ee359d9559cc4e11597)

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoavcodec/aacps: Fix undefined behavior
Michael Niedermayer [Fri, 5 May 2017 11:16:07 +0000 (13:16 +0200)]
avcodec/aacps: Fix undefined behavior

Fixes: 1337/clusterfuzz-testcase-minimized-5212314171080704

Fixes the existence of a potentially invalid pointer intermediate

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/pixlet: Fix shift exponent 4294967268 is too large for 32-bit type 'int'
Michael Niedermayer [Fri, 5 May 2017 11:02:22 +0000 (13:02 +0200)]
avcodec/pixlet: Fix shift exponent 4294967268 is too large for 32-bit type 'int'

Fixes: 1336/clusterfuzz-testcase-minimized-4761381930795008

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/tiertexseqv: set the fixed dimenasions, do not depend on the demuxer doing so
Michael Niedermayer [Fri, 5 May 2017 10:48:12 +0000 (12:48 +0200)]
avcodec/tiertexseqv: set the fixed dimenasions, do not depend on the demuxer doing so

Fixes: out of array access
Fixes: 1348/clusterfuzz-testcase-minimized-6195673642827776

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoMerge commit '89725a8512721fffd190021ded2d3f5b42e20e2a'
Clément Bœsch [Fri, 5 May 2017 11:34:03 +0000 (13:34 +0200)]
Merge commit '89725a8512721fffd190021ded2d3f5b42e20e2a'

* commit '89725a8512721fffd190021ded2d3f5b42e20e2a':
  vaapi_h264: Scale log2_max_pic_order_cnt_lsb with max_b_frames

This commit is a noop, see eefa4b76ee5a1059a36d8bd77b123c2cfbfea604

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f'
Clément Bœsch [Fri, 5 May 2017 11:33:24 +0000 (13:33 +0200)]
Merge commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f'

* commit 'a3c3a5eac20a51d402c332cdf5220fff40a7943f':
  vaapi_encode: Support forcing IDR frames via AVFrame.pict_type

This commit is a noop, see c667c0979cbc2e04d1d00964b82ac49746caa43c

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'
Clément Bœsch [Fri, 5 May 2017 11:32:29 +0000 (13:32 +0200)]
Merge commit '37fab0661a760b2a9d727939d72e629acee1a6ef'

* commit '37fab0661a760b2a9d727939d72e629acee1a6ef':
  vaapi_encode: Fix GOP sizing

This commit is a noop, see 760f1a7727583e07efb1d4b0d8e28a1dd2c54a93

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2'
Clément Bœsch [Fri, 5 May 2017 11:31:35 +0000 (13:31 +0200)]
Merge commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2'

* commit 'bd6496fa07e32fd09ceb79404f9af43df959bcb2':
  interplayvideo: Convert to the new bitstream reader
  adx: Convert to the new bitstream reader
  dvbsubdec: Convert to the new bitstream reader
  motionpixels: 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>
2 years agoMerge commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14'
Clément Bœsch [Fri, 5 May 2017 11:27:03 +0000 (13:27 +0200)]
Merge commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14'

* commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14':
  hmac: Explicitly convert types at function pointer assignment

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agolavu/sha512: update length argument following sha+md5 changes
Clément Bœsch [Fri, 5 May 2017 11:21:39 +0000 (13:21 +0200)]
lavu/sha512: update length argument following sha+md5 changes

2 years agoMerge commit 'e435beb1ea5380a90774dbf51fdc8c941e486551'
Clément Bœsch [Fri, 5 May 2017 11:04:24 +0000 (13:04 +0200)]
Merge commit 'e435beb1ea5380a90774dbf51fdc8c941e486551'

* commit 'e435beb1ea5380a90774dbf51fdc8c941e486551':
  crypto: consistently use size_t as type for length parameters

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'
Clément Bœsch [Fri, 5 May 2017 09:33:17 +0000 (11:33 +0200)]
Merge commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed'

* commit 'f1af37b51033ad90e56a8d7dfcc366f2bd9d2fed':
  h264dec: make ff_h264_decode_init() static

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851'
Clément Bœsch [Fri, 5 May 2017 09:32:32 +0000 (11:32 +0200)]
Merge commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851'

* commit 'e7de05f98f630b5b3a5e441c8fa763e6d89b8851':
  h264dec: drop a redundant check

This commit is a noop, see 4cc1ce4a91788a71670ea43fa0026b5a969e9e9e

Merged-by: Clément Bœsch <cboesch@gopro.com>
2 years agoMerge commit '3cba1ad76d362c994fa98fb686e04e20826fb579'
Clément Bœsch [Fri, 5 May 2017 09:31:01 +0000 (11:31 +0200)]
Merge commit '3cba1ad76d362c994fa98fb686e04e20826fb579'

* commit '3cba1ad76d362c994fa98fb686e04e20826fb579':
  x86inc: Avoid using eax/rax for storing the stack pointer

This commit is a noop, see cd09e3b34903db7b7e37fdb4d3e10549bf8b2e82

Merged-by: Clément Bœsch <cboesch@gopro.com>