1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

88550 Commits

Author SHA1 Message Date
Michael Niedermayer
4b51437dcc avcodec/xan: Check for bitstream end in xan_huffman_decode()
Fixes: Timeout
Fixes: 3707/clusterfuzz-testcase-6465922706440192

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-05 03:12:35 +01:00
Michael Niedermayer
66f0c958bf avcodec/exr: fix undefined shift in pxr24_uncompress()
Fixes: runtime error: left shift of 255 by 24 places cannot be represented in type 'int'
Fixes: 3787/clusterfuzz-testcase-minimized-5728764920070144

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-05 03:12:35 +01:00
Kieran Kunhya
1358f7ddb3 Revert "vc2enc: Calculate average slice quantiser correctly"
This reverts commit 626d200e76.
2017-11-04 18:31:59 +00:00
Marton Balint
415038f2bd ffplay: only use hardware accelerated SDL texture formats
Typically only a small subset of the SDL texture formats are supported directly
by the SDL renderer drivers, the rest is software emulated. It's better if
libswscale does the format conversion to a hardware-accelerated texture format
instead of SDL.

This should fix video render slowdowns with some texture formats after
3bd2228d05.

Signed-off-by: Marton Balint <cus@passwd.hu>
2017-11-04 19:27:37 +01:00
Marton Balint
84d31e2475 ffplay: create the window and the renderer before starting playback
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-11-04 19:27:37 +01:00
Kieran Kunhya
626d200e76 vc2enc: Calculate average slice quantiser correctly 2017-11-04 18:18:25 +00:00
Kieran Kunhya
77748d12a0 h264: Make Truncating SPS/PPS message debug. 2017-11-04 18:14:00 +00:00
Kieran Kunhya
03b82b3ab9 h2645_parse: Allocate a single buffer per packet
Drastically reduces memory usage on pathological streams.
Fixes ticket #6789
2017-11-04 18:06:45 +00:00
Carl Eugen Hoyos
3357b68bc0 lavc/alac: Avoid allocating huge memory blocks for malicious alac input. 2017-11-04 17:08:18 +01:00
Kaustubh Raste
8f6c398d44 avcodec/mips: Improve hevc bi wgt 4 tap hz and vt mc msa functions
Use global mask buffer for appropriate mask load.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-04 05:05:03 +01:00
Kaustubh Raste
e1555eb76c avcodec/mips: Improve hevc bi 4 tap hz and vt mc msa functions
Use global mask buffer for appropriate mask load.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-04 05:05:03 +01:00
Kaustubh Raste
5cb261301c avcodec/mips: Improve avc avg mc 20, 21 and 23 msa functions
Load the specific destination bytes instead of MSA load and pack.
Remove unused macros and functions.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-04 05:05:03 +01:00
Sasi Inguva
c2a8f0fcbe lavf/mov.c: Refine edit list start seek, based on PTS computed from CTTS.
Partially fixes t/6699.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-04 05:05:03 +01:00
Carl Eugen Hoyos
9d0b42bce5 fate: Fix fitsdec-gbrap16 test on big-endian hardware. 2017-11-04 00:47:37 +01:00
Paul B Mahol
1f24b33d9a avfilter/vf_tile: remove limit of max tile size
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-11-03 21:15:42 +01:00
Nicolas Frattaroli
6a50a8f340 snowenc: fix use of deprecated API
Replace avcodec_get_chroma_sub_sample with the recommended
av_pix_fmt_get_chroma_sub_sample, which fixes a compilation warning.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-03 13:33:14 +01:00
Nicolas Frattaroli
1c06a32cfa diracdec: fix deprecated API usage
avcodec_get_chroma_sub_sample is deprecated and generates a warning
during build, so av_pix_fmt_get_chroma_sub_sample is used

Signed-off-by: Nicolas Frattaroli <ffmpeg@fratti.ch>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-03 00:26:26 -03:00
James Almer
2805c8dcfc Merge commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888'
* commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888':
  tls_gnutls: Readd support for nonblocking operation

Merged-by: James Almer <jamrial@gmail.com>
2017-11-02 23:39:28 -03:00
James Almer
575fc7e80a Merge commit '0671eb2346c17e8fb13784cf90ce416661fdea1c'
* commit '0671eb2346c17e8fb13784cf90ce416661fdea1c':
  tls_openssl: Readd support for nonblocking operation

Merged-by: James Almer <jamrial@gmail.com>
2017-11-02 23:27:53 -03:00
James Almer
eaa25b09e4 avformat/tls_openssl: move some functions up in the file
Cosmetic change, reduces differences with libav.
2017-11-02 23:26:46 -03:00
James Almer
90adafe6aa Merge commit '84ab1cc437fa47a00532f305b9fe15b5b66c8c5e'
* commit '84ab1cc437fa47a00532f305b9fe15b5b66c8c5e':
  movenc: allow alternative hvc1 h.265 codec tag
  movenc: write correct format hvcc when tag is hvc1
  movenc: move tags definitions to where they are used
  movenc: simplify codec_tag lookup
  movenc: use correct tag list for AVOutputFormat.codec_tag
  aarch64: vp9: Fix assembling with Xcode 6.2 and older
  doc: Drop the legacy symlink to README

This commit is a noop, see
998609ddb8
95f3c85976
e199d90da6
38d808d72e
974d508e57
369a3e111c

Merged-by: James Almer <jamrial@gmail.com>
2017-11-02 21:57:01 -03:00
Michael Niedermayer
cf5a6c754a avcodec/gdv: Check compression before allocating frame
Fixes: 2926/clusterfuzz-testcase-4987110014582784

This reduces decoding time from 7 to 4 seconds

The timeout should have been fixed in 0561bd2fc2 but ossfuzz did not close this issue

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-03 00:56:30 +01:00
Kaustubh Raste
48d77d5cd4 avcodec/mips: Improve hevc uni weighted hv mc msa functions
Use immediate unsigned saturation for clip to max saving one vector register.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-03 00:56:30 +01:00
Kaustubh Raste
72dbc610be avcodec/mips: Improve avc avg mc 02, 12 and 32 msa functions
Remove loops and unroll as block sizes are known.
Load the specific destination bytes instead of MSA load and pack.
Remove unused macro and functions.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-03 00:56:30 +01:00
Steven Liu
c7360512c2 avformat/hlsenc: reindent hlsenc code
Signed-off-by: Steven Liu <lq@onvideo.cn>
2017-11-02 22:30:06 +08:00
Steven Liu
c52beb4839 avformat/hlsenc: check hls segment mode for ignore the init filename
ignore the fmp4_init_filename when in normal hls segment mode

Signed-off-by: Steven Liu <lq@onvideo.cn>
2017-11-02 22:29:28 +08:00
Nicolas George
d5995c531d lavfi/framepool: use av_image_check_size2().
Allow filters to handle larger frames.
2017-11-02 12:23:46 +01:00
Nicolas George
345e7072ab lavfi: check links properties after configuring them.
For now, check the image size.
Inspired by a patch from Paul B Mahol.

Invalid sizes would be detected later by allocation failures,
detecting problems earlier is cleaner.
2017-11-02 10:42:16 +01:00
James Almer
5ab41a25ba Merge commit 'fd1ffa1f10e940165035ccb79d4a6523da196062'
* commit 'fd1ffa1f10e940165035ccb79d4a6523da196062':
  d3d11va: Link directly to dxgi.dll and d3d11.dll functions if LoadLibrary is unavailable

This commit is a noop, see 3125a4a8a8

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 21:02:02 -03:00
James Almer
1076f93a94 Merge commit 'c2b0bea40f1fd4399ff6184a2df4f397c0f4b3ab'
* commit 'c2b0bea40f1fd4399ff6184a2df4f397c0f4b3ab':
  avconv_hw: Free device on initialisation failure
  vf_hwmap: Properly free a locally derived device
  vf_hwmap: Add missing error code
  configure: Fix handling of _select dependencies

This commit is a noop, see
6dfcbd80ad
d984b29b21
70808859dd
f434ddf48e

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:58:26 -03:00
James Almer
7e5ebd0009 Merge commit '7b1f9873be2f9d5aea2762c9197ff46df82768dc'
* commit '7b1f9873be2f9d5aea2762c9197ff46df82768dc':
  build: Adjust dependencies for faan(i)dct components

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:56:07 -03:00
James Almer
9f10052c9d Merge commit '635897ac78ef29869f0321ab921c91b3e1aad453'
* commit '635897ac78ef29869f0321ab921c91b3e1aad453':
  configure: Factorize qsv dependencies

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:51:03 -03:00
James Almer
6c35f89067 Merge commit 'c599c43fa147d7a001cdbf8f3b7da0a965f2e285'
* commit 'c599c43fa147d7a001cdbf8f3b7da0a965f2e285':
  configure: Add missing arch dependencies for arch extensions

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:39:37 -03:00
James Almer
7116e6894b Merge commit '9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6'
* commit '9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6':
  configure: Add x86 dependency for mmx_internal

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:33:47 -03:00
James Almer
580732e3a5 Merge commit '2f792cb6703b5b12f2e873bee13f33da8aa9940a'
* commit '2f792cb6703b5b12f2e873bee13f33da8aa9940a':
  build: Add missing idctdsp dependency for clearvideo
  build: Add missing mpeg4audio dependency for RTP muxer

This commit is a noop, see
52f954da75
155f071bad

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:33:02 -03:00
James Almer
862c85b2ff Merge commit '4993a68f0f9285f92a42a54305dc0244665b7db4'
* commit '4993a68f0f9285f92a42a54305dc0244665b7db4':
  hwcontext: Mark local table static const
  libfdk-aacdec: Correct buffer_size parameter

This commit is a noop, see
ca6776a993
0b1794a43e

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:24:14 -03:00
James Almer
f3f1bbc6a8 Merge commit '04f691cd4fb7d226e54df886a21ba201cb5019f4'
* commit '04f691cd4fb7d226e54df886a21ba201cb5019f4':
  mmal: Add missing .item_name to AVClass declaration

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:21:35 -03:00
James Almer
5352db1dd0 Merge commit 'e2edf1529cb35eaf043e3f8e5cba498ed06e2563'
* commit 'e2edf1529cb35eaf043e3f8e5cba498ed06e2563':
  configure: Simplify AltiVec/VSX check with a helper function

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:18:54 -03:00
James Almer
2eb20caccf Merge commit 'd76479c5020ca43e67d47ba3767146b192dc4782'
* commit 'd76479c5020ca43e67d47ba3767146b192dc4782':
  ppc: Drop support for Apple GCC

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:16:33 -03:00
James Almer
e621b1ca64 Merge commit '97cfe1d8bd1968143e2ba9aa46ebe9504a835e24'
* commit '97cfe1d8bd1968143e2ba9aa46ebe9504a835e24':
  Convert all AVClass struct declarations to designated initializers.

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 20:05:09 -03:00
Gyan Doshi
3524c92950 lavf/img2enc: remove redundant option 'updatefirst'
'updatefirst' is an undocumented option redundant to older option 'update'. Since it doesn't serve as a shorthand, this patch removes it.
2017-11-01 14:44:08 -08:00
James Almer
358c886655 Merge commit '98ea98069b40c34aa7b762096f8f380012a7dd84'
* commit '98ea98069b40c34aa7b762096f8f380012a7dd84':
  nvenc: Add default value for AVCodecContext::refs

This commit is a noop, see d8da329cc3

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 18:51:40 -03:00
James Almer
508fc80850 Merge commit 'f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f'
* commit 'f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f':
  dxva: add support for new dxva2 and d3d11 hwaccel APIs
  dxva: move d3d11 locking/unlocking to functions
  dxva: preparations for new hwaccel API
  lavc: set avctx->hwaccel before init
  lavu: add new D3D11 pixfmt and hwcontext

This commit is a noop, see
3303511f33
865360ba63
ab28108a36
5659f74047
70143a3954

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 18:46:44 -03:00
James Almer
070336b89b Merge commit 'ed434be106a4615e0419b3ac7664220741afda2d'
* commit 'ed434be106a4615e0419b3ac7664220741afda2d':
  configure: Bail out if both GnuTLS and OpenSSL are enabled
  configure: Move x86 assembler sanity check into assembler probe function
  build: Add missing zlib dependencies for several protocols

This commit is a noop, see
6dfcbd80ad
5cae5a1def
4600b0619a

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 18:45:23 -03:00
Carl Eugen Hoyos
42a9722a5c lavc/ppc/hpeldsp_altivec: Remove declaration of two unused variables. 2017-11-01 22:41:09 +01:00
James Almer
3df4939988 avcodec/dca: return standard error codes in avpriv_dca_parse_core_frame_header()
This prevents making the DCAParseError enum part of the ABI.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Reviewed-by: foo86 <foobaz86@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-11-01 18:36:53 -03:00
Michael Niedermayer
2b739e1cb8 avcodec/h264idct_template: Fix integer overflows in ff_h264_idct8_add()
Fixes: runtime error: signed integer overflow: 924846844 + 1457520640 cannot be represented in type 'int'
Fixes: 3416/clusterfuzz-testcase-minimized-6125587682820096

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-01 22:11:10 +01:00
Michael Niedermayer
e8fafef1db avcodec/xan: Improve overlapping check
Fixes: memcpy-param-overlap
Fixes: 3612/clusterfuzz-testcase-minimized-6393461273001984

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-11-01 22:11:10 +01:00
James Almer
26868f80e0 Merge commit '908f737d6c2900b5d34319ca6ea1d1cb71221463'
* commit '908f737d6c2900b5d34319ca6ea1d1cb71221463':
  cmdutils: Mark conditionally used variable as av_unused

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 18:01:32 -03:00
James Almer
8e8d4cf832 Merge commit 'f960fd2fb1218d49866d0bf47cbf839233fb9904'
* commit 'f960fd2fb1218d49866d0bf47cbf839233fb9904':
  build: Skip generating .version files when reconfiguring

Merged-by: James Almer <jamrial@gmail.com>
2017-11-01 17:38:30 -03:00