highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
73,155 Commits 36 Branches 392 Tags
6fe1f5646e12c53794ccf69f05a32664074be93a
Commit Graph

73155 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
6fe1f5646e avcodec/mjpegdec: Fix decoding slightly odd progressive jpeg 
Fixes: ebd58db6-dc86-11e5-91c2-59daeddf50c7.jpg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c6f4720b86)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:13 +02:00
Michael Niedermayer
c6950985cb avcodec/avpacket: clear priv in av_init_packet() 
This should fix leaving uninitialized pointers in priv which can confuse
user applications.
See: https://github.com/golang/go/issues/14426

Only or release branches

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:12 +02:00
Michael Niedermayer
751e525757 swscale/utils: Fix chrSrcHSubSample for GBRAP16 
Fixes part of Ticket5264

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 67e5bd0c50)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:12 +02:00
Michael Niedermayer
19257891d1 swscale/input: Fix GBRAP16 input 
Fixes part of Ticket5264

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit df36257a53)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:12 +02:00
Carl Eugen Hoyos
c7b34fa733 postproc: fix unaligned access 
Based on 59074310 by Andreas Cadhalpun.
Fixes ticket #5259.
(cherry picked from commit 2aa21eec1a)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:12 +02:00
Michael Niedermayer
b8148973c5 avutil/pixdesc: Make get_color_type() aware of CIE XYZ formats 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 1ec7a70380)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:12 +02:00
Michael Niedermayer
8dce138510 avcodec/h264: Execute error concealment before marking the frame as done. 
Fixes race condition causing artifacts
Fixes Ticket4122

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 98a0053d0f)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:12 +02:00
Michael Niedermayer
13b75ba30a swscale/x86/output: Fix yuv2planeX_16* with unaligned destination 
Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f6492a2ea8)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:12 +02:00
Michael Niedermayer
34e76d75a0 swscale/x86/output: Move code into yuv2planeX_mainloop 
Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit d07f6e5f1c)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:12 +02:00
KO Myung-Hun
010fd5deb6 MAINTAINERS: add myself as an OS/2 maintainer 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 346ec91764)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:12 +02:00
Michael Niedermayer
46e791a9b3 avutil/frame: Free destination qp_table_buf in frame_copy_props() 
Fixes memleak
Fixes: Ticket4899

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 4099e4a77d)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-28 03:47:12 +02:00
James Almer
d2161b8a6d libwebpenc_animencoder: print library messages in verbose log levels 
Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit f875ba4873)
 2016-03-17 12:57:51 -03:00
James Almer
c5e12dc10d libwebpenc_animencoder: zero initialize the WebPAnimEncoderOptions struct 
This zeroes the WebPAnimEncoderOptions.verbose field, silencing library info messages
printed to stderr.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 626b6b769c)
 2016-03-17 12:57:47 -03:00
Paul B Mahol
4ecb216ad4 doc/utils: fix typo for min() description 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit bdf474bcff)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
 2016-03-02 16:44:30 -08:00
Michael Niedermayer
d2b2c66b17 MAINTAINERS: remove unmaintained releases 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
n2.7.6 		2016-01-31 00:43:51 +01:00
Michael Niedermayer
bbea86d809 Update for 2.7.6 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:42:09 +01:00
Michael Niedermayer
12f256a729 avcodec/jpeg2000dec: More completely check cdef 
Fixes out of array access
Fixes: j2k-poc.bin

Found-by: Lucas Leong <wmliang.tw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 0aada30510)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:46 +01:00
Michael Niedermayer
b54b8a628c avutil/opt: check for and handle errors in av_opt_set_dict2() 
Previously errors could result in random entries to be lost.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f3ace85d88)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:46 +01:00
Paul B Mahol
d8b37664d5 avcodec/flacenc: fix calculation of bits required in case of custom sample rate 
Sample rate of 11025 takes 16 bits but previous code would pick only 8.
Fixes assertion failure.

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 3e7d684912)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:46 +01:00
Michael Niedermayer
41f97fe378 avformat: Document urls a bit 
Spell-checked-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3130556c0e)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:46 +01:00
Michael Niedermayer
197c0f618a avformat/libquvi: Set default demuxer and protocol limitations 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 15cc98a0f3)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:46 +01:00
Michael Niedermayer
573a7b4c67 avformat/concat: Check protocol prefix 
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8e32d01432)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:46 +01:00
Michael Niedermayer
3c7597f2e9 doc/demuxers: Document enable_drefs and use_absolute_path 
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9a8034b8bc)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:46 +01:00
Michael Niedermayer
965a8bda94 avcodec/mjpegdec: Check for end for both bytes in unescaping 
Fixes assertion failure
Fixes: c40c779601b77dc6e19aaea0b04b9751/signal_sigabrt_7ffff6ae7cb7_5769_b94f6ec70caecb2d3d76b4771b109ac1.avi

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 509c9e74e5)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:46 +01:00
Michael Niedermayer
e229fbf5ce avcodec/mpegvideo_enc: Check for integer overflow in ff_mpv_reallocate_putbitbuffer() 
Fixes assertion failure
Fixes: 6568d187979ce17878b6fe5fbbb89142/signal_sigabrt_7ffff6ae7cb7_7176_564bbc6741bdcf907f5c4e685c9a77a2.mpg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b65efbc0f4)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
874945c7b9 avformat/avformat: Replace some references to filenames by urls 
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 41e07390e0)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
974f9d255d avcodec/wmaenc: Check ff_wma_init() for failure 
Fixes null pointer dereference
Fixes: c4faf8280ba366bf00a79d425f2910a8/signal_sigsegv_1f96477_5177_1448ba7e4125faceb966f44ceb69abfa.qcp
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 19e456d48c)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
302f11e719 avcodec/mpeg12enc: Move high resolution thread check to before initializing threads 
Cleaner solution is welcome!

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a53fbda9dc)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
8c2f006d10 avformat/img2dec: Use AVOpenCallback 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b750b67d13)

Conflicts:

	libavformat/img2dec.c
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
3cd17b9b5c avformat/avio: Limit url option parsing to the documented cases 
This feature is not know much or used much AFAIK, and it might be helpfull in
exploits.
No specific case is known where it can be used in an exploit though
subsequent commits depend on this commit though

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 984d58a344)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
4180a83892 avformat/img2dec: do not interpret the filename by default if a IO context has been opened 
With this, user applications which use custom IO and have set a IO context will not have
their already opened IO context ignored and glob/seq being interpreted

Comments and tests from maintainers of user apps are welcome!

Liked-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 7ccedc1c78)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
6fabd85865 avcodec/ass_split: Fix null pointer dereference in ff_ass_style_get() 
Fixes: 55d71971da50365d542ed14b65565fe1/signal_sigsegv_4765a4_8499_f146af090a94f591d6254515c7700ef5.mkv

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 158f0545d8)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Derek Buitenhuis
c6ab367dbe mov: Add an option to toggle dref opening 
This feature is mostly only used by NLE software, and is
both of dubious value being enabled by default, and a
possible security risk.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 712d962a6a)

Conflicts:

	libavformat/isom.h
	libavformat/mov.c
	libavformat/version.h

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
40e846bb3f avcodec/gif: Fix lzw buffer size 
Fixes out of array access
Fixes: aaa479088e6fb40b04837b3119f47b04/asan_heap-oob_e38c68_8576_9d653078b2470700e2834636f12ff557.tga

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 03d83ba34b)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
f6755e5e19 avcodec/put_bits: Assert buf_ptr in flush_put_bits() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3ef5de0f19)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
eb0872335f avcodec/tiff: Check subsample & rps values more completely 
Fixes out of array access
Fixes: 83aedfb29af669c4d6e10f1bfad974d2/asan_heap-oob_1ab42fe_4984_9f6ec14462f8d8a00ea24b320572a963.tif

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 89f464e9c2)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
1b6390dd5b swscale/swscale: Add some sanity checks for srcSlice* parameters 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 321e85e176)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
edc7ef376b swscale/x86/rgb2rgb_template: Fix planar2x() for short width 
Fixes: 451b3e0cf956c0bd2f27ed753ac24050/asan_heap-oob_2873c01_3231_7ed10a9464d15f0d57277f5917c566a8.AVI

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c8a9aaab26)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
1a88eef93b swscale/swscale_unscaled: Fix odd height inputs for bayer_to_yv12_wrapper() 
Fixes: 372d2df1f04b49e25f109f07f90b1505/asan_heap-oob_2835d2e_8501_99e0114d7ba3a6db885d0b4684d200c1.cine
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 757248ea3c)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
d3cefc271d swscale/swscale_unscaled: Fix odd height inputs for bayer_to_rgb24_wrapper() 
Fixes: 372d2df1f04b49e25f109f07f90b1505/asan_heap-oob_2835d2e_8501_99e0114d7ba3a6db885d0b4684d200c1.cine
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ad3b6fa7d8)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
9d230f4666 avcodec/aacenc: Check both channels for finiteness 
Fixes null pointer dereference
Fixes: 10412fc52ecc6eab40ed67f82ca7b372/signal_sigsegv_2618c99_2129_f808373959e46afb165593332799ffbc.aif

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 057549a9cc)

Conflicts:

	libavcodec/aacenc.c
 2016-01-31 00:23:45 +01:00
Michael Niedermayer
4b17205c77 swscale/swscale-test: Fix slice height in random reference data creation. 
Found-by: Pedro Arthur <bygrandao@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:23:45 +01:00
Andreas Cadhalpun
41157f6bff dca: fix misaligned access in avpriv_dca_convert_bitstream 
src and dst are only 8-bit-aligned, so accessing them as uint16_t causes
SIGBUS crashes on architectures like sparc.

This fixes ubsan runtime error: load of misaligned address for type
'const uint16_t', which requires 2 byte alignment

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 44ac13eed4)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-28 01:05:05 +01:00
Andreas Cadhalpun
f106232e94 brstm: fix missing closing brace 
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 1cb2331eca)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-28 01:05:04 +01:00
Andreas Cadhalpun
269a522aec brstm: also allocate b->table in read_packet 
This fixes NULL pointer dereferencing if the codec is forced to
adpcm_thp even though a different one was detected.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit bcf4ee26a0)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-28 01:05:04 +01:00
Andreas Cadhalpun
496c02a065 brstm: make sure an ADPC chunk was read for adpcm_thp 
This fixes NULL pointer dereferencing.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit d7d37c479f)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-28 01:05:04 +01:00
Andreas Cadhalpun
6fe77207ed vorbisdec: reject rangebits 0 with non-0 partitions 
This causes non-unique elements in floor_setup->data.t1.list, which
makes the stream undecodable according to the specification.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit e7a7b3135a)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-28 00:49:17 +01:00
Andreas Cadhalpun
00a0c0fd75 vorbisdec: reject channel mapping with less than two channels 
It causes the angle channel number to equal the magnitude channel
number, which makes the stream undecodable according to the
specification.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit b4b13848de)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-28 00:49:12 +01:00
Andreas Cadhalpun
a21ec4e1ee ffmdec: reset packet_end in case of failure 
This fixes segmentation faults caused by passing a packet_ptr of NULL to
memcpy.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
(cherry picked from commit 40eb2531b2)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-28 00:49:08 +01:00
Paul B Mahol
0c03d860f4 avformat/ipmovie: put video decoding_map_size into packet and use it in decoder 
The size of decoding map can differ from one calculated
internally, producing artifacts while decoding video.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit c293ef258c)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-28 00:48:51 +01:00