generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
68,867 Commits 24 Branches 241 Tags
0b51d15a0e577b7b3bbc05ce1105850cf5ca7732
Commit Graph

68867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
0b51d15a0e 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-05-01 05:00:44 +02:00
Michael Niedermayer
8c40fc62ce 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-05-01 05:00:44 +02:00
Carl Eugen Hoyos
d8586b7aca 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-05-01 05:00:44 +02:00
Michael Niedermayer
e44775580f 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-05-01 05:00:44 +02:00
Michael Niedermayer
39664fb647 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-05-01 05:00:44 +02:00
Michael Niedermayer
a3db73c44d 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-05-01 05:00:44 +02:00
KO Myung-Hun
3b931399eb 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-05-01 05:00:44 +02:00
Paul B Mahol
c40ee0a107 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:45:05 -08:00
Michael Niedermayer
60eebbbf22 Update for 2.5.11 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
n2.5.11 		2016-02-01 20:44:56 +01:00
Michael Niedermayer
5eca7ba16b MAINTAINERS: remove unmaintained releases 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:45:17 +01:00
Michael Niedermayer
69e191f854 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:24:52 +01:00
Michael Niedermayer
3fa6ecca76 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:24:52 +01:00
Paul B Mahol
d7c0287fbd 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:24:52 +01:00
Michael Niedermayer
7bcf142c02 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:24:52 +01:00
Michael Niedermayer
0251cd6cf3 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:24:52 +01:00
Michael Niedermayer
dde76f2d04 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:24:52 +01:00
Michael Niedermayer
e46999ccf4 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:24:52 +01:00
Michael Niedermayer
58ea532cad 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:24:52 +01:00
Michael Niedermayer
0ec1ffcb4d 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:24:51 +01:00
Michael Niedermayer
2df2c0aab0 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:24:51 +01:00
Michael Niedermayer
65bb07d4be 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:24:51 +01:00
Michael Niedermayer
3fc75e79cf 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:24:51 +01:00
Michael Niedermayer
30463a0c99 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:24:51 +01:00
Michael Niedermayer
7ee0b1937a 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:24:51 +01:00
Derek Buitenhuis
dd957b56e6 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>

Conflicts:

	libavformat/mov.c
 2016-01-31 00:24:51 +01:00
Michael Niedermayer
9f30eafd0f 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:24:51 +01:00
Michael Niedermayer
22e20a1d83 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:24:51 +01:00
Michael Niedermayer
dee25a5fa5 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:24:51 +01:00
Michael Niedermayer
0f956cde93 swscale/swscale: Add some sanity checks for srcSlice* parameters 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 321e85e176)

Conflicts:

	libswscale/swscale.c

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-31 00:24:51 +01:00
Michael Niedermayer
9631209eea 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:24:51 +01:00
Michael Niedermayer
93c675d6a6 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:24:51 +01:00
Michael Niedermayer
262192a48b 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:24:51 +01:00
Michael Niedermayer
b515a23f76 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:24:51 +01:00
Michael Niedermayer
d1fc87529f 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:24:37 +01:00
Andreas Cadhalpun
873a0dfa26 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:50:35 +01:00
Andreas Cadhalpun
f2fd5b9eb2 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:50:35 +01:00
Andreas Cadhalpun
cdedd71a7e 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:50:34 +01:00
Andreas Cadhalpun
a90a7594a8 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:50:33 +01:00
Andreas Cadhalpun
641a010157 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 01:50:33 +01:00
Andreas Cadhalpun
b6fb6ccda4 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 01:50:33 +01:00
Andreas Cadhalpun
3b535bbf88 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 01:50:33 +01:00
Paul B Mahol
bf44699314 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 01:50:33 +01:00
Clément Bœsch
1a65265131 avcodec/samidec: make sure to properly restore parsing context after a tag 
(cherry picked from commit 70082a1e53)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-01-28 01:50:32 +01:00
James Almer
7e297b4bc6 avcodec/wavpackenc: print channel count in av_log call 
Fixes a warning with -Wformat-extra-args
(cherry picked from commit 17e7fdf61a)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
n2.5.10 		2016-01-15 17:54:00 +01:00
Michael Niedermayer
fba2fdaea3 Update for 2.5.10 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-15 17:49:08 +01:00
James Almer
6456043ff7 configure: bump copyright year to 2016 
Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 78129978f0)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-15 17:39:05 +01:00
Michael Niedermayer
83913c6e7e avformat/hls: Even stricter URL checks 
This fixes a null pointer dereference at least

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

Conflicts:

	libavformat/hls.c
 2016-01-15 17:39:05 +01:00
Michael Niedermayer
8d5060192c avformat/hls: More strict url checks 
No case is known where these are needed

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

Conflicts:

	libavformat/hls.c

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Conflicts:

	libavformat/hls.c
 2016-01-15 17:39:05 +01:00
Michael Niedermayer
4089af67ab swscale/utils: Detect and skip unneeded sws_setColorspaceDetails() calls 
This avoids running various table inits unnecessarily

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

Conflicts:

	libswscale/utils.c
 2016-01-15 17:39:05 +01:00
Michael Niedermayer
dc6a9162a2 swscale/yuv2rgb: Increase YUV2RGB table headroom 
This makes SWS more robust
Fixes: 07650a772d98aa63b0fed6370dc89037/asan_heap-oob_27ddeaf_2657_2c81ff264dee5d9712cb3251fb9c3bbb.264
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 8f3a9a8c27)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-01-15 17:39:04 +01:00