RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
82,172 Commits 36 Branches 392 Tags 311 MiB
Commit Graph

82172 Commits

Author SHA1 Message Date
Mark Thompson 1f26a231bb qsv: Merge libav implementation 
Merged as-at libav 398f015, and therefore includes outstanding
skipped merges 04b17ff and 130e1f1.

All features not in libav are preserved, and no options change.
 2016-10-31 19:23:40 +00:00
Mark Thompson 309fe16a12 mpegvideo: Return correct coded frame sizes from parser 2016-10-31 19:23:40 +00:00
Mark Thompson 0c559f7893 hevc: Return stream format information from parser 2016-10-31 19:23:40 +00:00
Mark Thompson 4df6605da7 vc1: Return stream format information from parser 2016-10-31 19:23:40 +00:00
Sasi Inguva 5e965582d5 lavf/mov.c: Use the correct timescale when seeking for audio. 
Signed-off-by: Sasi Inguva <isasi@google.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-10-31 13:43:43 +00:00
Reynaldo H. Verdejo Pinochet 894e7ef9b4 configure: add '-uninstalled' to uninstalled .pc files 
pkg-config(1) expects uninstalled pc files to follow the
blah-uninstalled.pc naming convention and the behavior
of the program is impacted by it. Without this fix
overriding PKGP_CONFIG_LIBDIR is required to ensure
uninstalled files are preferred (overkill), instead of
just adding pc-uninstalled/ to the utility's search path
by setting PKG_CONFIG_PATH accordingly.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
 2016-10-30 20:50:11 -07:00
Michael Niedermayer 5f0bc0215a avcodec/rawdec: Check side data size before use 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-31 01:19:16 +01:00
Michael Niedermayer 0f64b6cd22 avcodec/rscc: Check side data size before use 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-31 01:11:03 +01:00
Michael Niedermayer 161ccdaa06 avcodec/msvideo1: Check side data size before use 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-31 01:08:45 +01:00
Michael Niedermayer 16793504df avcodec/qpeg: Check side data size before use 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-31 00:36:12 +01:00
Michael Niedermayer 7d196f2a5a avcodec/qtrle: Check side data size before use 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-31 00:27:45 +01:00
Michael Niedermayer a6330119a0 avcodec/msrle: Check side data size before use 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-31 00:19:02 +01:00
Philip Langdale 21b68cdbae avcodec/cuvid: Don't claim to decode h.263 (it doesn't) 
Turns out cuvid doesn't support h.263.
 2016-10-30 15:47:37 -07:00
Andreas Cadhalpun 5540d6c134 interplayacm: validate number of channels 
The number of channels is used as divisor in decode_frame, so it must
not be zero to avoid SIGFPE crashes.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-10-30 22:38:23 +01:00
Andreas Cadhalpun 14e4e26559 interplayacm: check for too large b 
This fixes out-of-bounds reads.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-10-30 22:38:03 +01:00
Michael Niedermayer 2d99101d09 avcodec/kmvc: Check side data size before use 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-30 15:38:44 +01:00
Michael Niedermayer a2b8dde659 avcodec/idcinvideo: Check side data size before use 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-30 15:38:44 +01:00
Mark Thompson e8634fb92e openssl: Allow newer TLS versions than TLSv1 
The use of TLSv1_*_method() disallows newer protocol versions; instead
use SSLv23_*_method() and then explicitly disable the deprecated
protocol versions which should not be supported.

Fixes ticket #5915.
 2016-10-30 13:18:45 +00:00
Michael Niedermayer 121be31060 avcodec/cinepak: Check side data size before use 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-30 14:15:00 +01:00
Michael Niedermayer 042faa847f avcodec/8bps: Check side data size before use 
Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-30 14:15:00 +01:00
Andreas Cadhalpun 1e660fe88d doc: fix spelling errors 
Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-10-29 20:43:15 +02:00
James Almer c4af48eb27 configure: add missing fork() dependency to http_multiclient example 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-29 14:45:29 -03:00
Muhammad Faiz 0686537002 avfilter/avf_showcqt: add bar_t option 
custom bargraph transparency

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
 2016-10-29 22:11:58 +07:00
Philip Langdale 7c27da686c crystalhd: Reorder mspeg4 decoder after software decoders 
This avoids it getting picked by default, which is generally
undesirable and can break test runs.
 2016-10-28 19:57:36 -07:00
Andreas Cadhalpun 890eb3d7c4 configure: make sure LTO does not optimize out the test functions 
Fixes trac ticket #5909

Bud-Id: https://bugs.gentoo.org/show_bug.cgi?id=598054
Acked-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-10-28 23:58:01 +02:00
Andreas Cadhalpun 97792e85c3 fate: add apng encoding/muxing test 
Also test the fallback to png creation for a single frame.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-10-28 23:55:52 +02:00
Michael Niedermayer 077939626e avformat/flvdec: Fix regression loosing streams 
Fixes: unknown_video.flv

Found-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-28 12:31:01 +02:00
Andreas Cadhalpun 940b8908b9 apng: use side data to pass extradata to muxer 
This fixes creating apng files, which is broken since commit
5ef1959080.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
 2016-10-28 01:53:52 +02:00
Stephen Hutchinson bf14393635 avisynth: fix Planar RGB output 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-27 04:37:57 +02:00
Rodger Combs f53c26c694
lavfi/vf_overlay: support NV12 and NV21 
Tested-by: Michael on x86-32/64 linux, mingw, mips/arm qemu linux
 2016-10-26 20:13:30 -05:00
James Almer bf709098c9 avcodec: remove missing incompatible_libav_abi references 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-26 17:36:12 -03:00
James Almer 7400f64211 configure: remove missing incompatible_libav_abi references 
Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-26 17:36:07 -03:00
James Almer eabbc64728 avformat/matroskaenc: fix cue relative position values when CRC32 is enabled 
The dynamic buffer does not contain the CRC32 element so calls to avio_tell()
don't take it into account. This resulted in CueRelativePosition values being
six bytes short.
This is a regression since 6724525a15

Instead of adding yet another custom check for CRC32 to fix a size or an offset,
remove the existing ones and reserve the six bytes in the dynamic buffer.

Signed-off-by: James Almer <jamrial@gmail.com>
 2016-10-26 16:28:59 -03:00
Michael Niedermayer e1b30c8a01 RELEASE: Update for past 3.2 branch 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:43 +02:00
Michael Niedermayer efa89a8419 Changelog: Add back next marker 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:43 +02:00
Michael Niedermayer 1609935b6c Bump minor versions after 3.2 branchpoint to seperate release 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:42 +02:00
Michael Niedermayer e84d587613 Changelog: Add 3.2 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:42 +02:00
Michael Niedermayer 36ecf30cbc doc/APIchanges: add 3.2 Cut marker 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:42 +02:00
Michael Niedermayer 3f3025205f Bump minor versions for 3.2 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 20:52:42 +02:00
Michael Niedermayer 38e5a4f3bb Revert "avformat/utils: Discard huge timestamps which would cause overflows if used in basic computations" 
Some people seem to oppose this the patch seems to have been missed for a month on the ML
lets restart the discussion and solve this after the release

This reverts commit e936c8d176.
 2016-10-26 20:31:04 +02:00
Michael Niedermayer c92f55847a avcodec/dvdsubdec: Fix off by 1 error 
Fixes out of array read

Found-by: Thomas Garnier using libFuzzer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 19:50:53 +02:00
Michael Niedermayer e936c8d176 avformat/utils: Discard huge timestamps which would cause overflows if used in basic computations 
Allowing larger timestamps makes it impossible to calculate basic things like the
difference of 2 timestamps or their sum without checking each individual computation for
overflow.
This should avoid a significant number of overflow checks

Fixes Ticket5136

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 19:46:00 +02:00
Michael Niedermayer d88a6bedb9 avformat/isom: Fix old API regression with exporting max bitrate 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 19:46:00 +02:00
Michael Niedermayer 4045a8d73e doc/patchwork: Document the patchwork states 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 19:46:00 +02:00
Michael Behrisch c5ac86256b lavu: remove comma at final enumeration items to fix pedantic warnings 2016-10-26 19:36:09 +02:00
Vodyannikov Aleksandr 9445e7e6d5 swresample/rematrix: Fix float part of swr_set_matrix() 
Fixes Ticket #5897.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 19:27:22 +02:00
Michael Niedermayer ded5c88528 configure: Remove --enable-incompatible-libav-abi from the help output 
As it does not work anymore since 655b6dcb34

Found-by: carl
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 19:27:08 +02:00
Michael Niedermayer 25ab1a65f3 avcodec/dvdsubdec: Fix buf_size check 
Fixes out of array access

Found-by: Thomas Garnier using libFuzzer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 18:46:10 +02:00
Michael Niedermayer 20182e79f9 doc/APIchanges: Fill in some missing things 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 03:06:50 +02:00
Suman- a81494b603 lavf/flvdec: init AVPacket::pos to FLVTAG offset 
Current code doesn't initialize AVPacket::pos. Made it point to FLVTAG so flv_read_packet can decode from pos

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-10-26 02:12:18 +02:00