1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

88265 Commits

Author SHA1 Message Date
James Almer
ae6fe04bee configure: add missing optional deps on gcrypt and openssl to the hls muxer
Should fix ticket #6738

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-16 17:47:01 -03:00
Martin Vignali
7480f232d2 libavcodec/texturedspenc : indent after add rgtc1u_alpha func
Signed-off-by: Tom Butterworth <bangnoise@gmail.com>
2017-10-16 15:35:04 +01:00
Martin Vignali
92500c7bc5 libavcodec/texturedsp : indent after add rgtc1u_alpha func
Signed-off-by: Tom Butterworth <bangnoise@gmail.com>
2017-10-16 15:34:56 +01:00
Martin Vignali
50a20de6b9 libavcodec/texturedspenc : add rgtc1_u_alpha encoding func
this func encode the alpha channel of the rgba input
to an rgtc1u block

Signed-off-by: Tom Butterworth <bangnoise@gmail.com>
2017-10-16 15:34:14 +01:00
Martin Vignali
d4d4629dfe libavcodec/texturedsp : add rgtc1u_alpha decoding func
this func decode an rgtc1 texture and overwrite only the alpha channel
of the dest RGBA picture

Signed-off-by: Tom Butterworth <bangnoise@gmail.com>
2017-10-16 15:34:03 +01:00
James Almer
0655810072 configure: add pkg-config checks for libcdio/cdparanoia
Should be more complete than the now fallback checks.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-14 21:36:14 -03:00
Michael Niedermayer
963247b5f3 avcodec/dvbsubdec: Split best score computation out of loop in compute_default_clut()
3% faster

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-14 23:23:25 +02:00
Michael Niedermayer
cd2f69cdd6 avcodec/dvbsubdec: Factor a few expressions out of compute_default_clut()
32% faster loop

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-14 23:23:25 +02:00
Michael Niedermayer
393d6fc739 avcodec/snowdec: Check mv_scale
Fixes: runtime error: signed integer overflow: 2 * -1094995530 cannot be represented in type 'int'
Fixes: 3512/clusterfuzz-testcase-minimized-4812747210489856

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-14 23:23:25 +02:00
Michael Niedermayer
9c85329cd0 avcodec/pafvideo: Check for bitstream end in decode_0()
Fixes: Timeout
Fixes: 3529/clusterfuzz-testcase-5057068371279872

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-14 23:23:25 +02:00
James Almer
ad56e8057d configure: force erroring out in check_disable_warning() if an option doesn't exists
Should prevent some options from being added to cflags when they
don't exist and the compiler only warns about it.

Reviewd-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-13 20:57:05 -03:00
Reino Wijnsma
458783315b configure: switch the libzvbi check to pkg-config
The library has several dependencies that vary between systems.
Their pkg-config properly lists them all.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-13 20:22:44 -03:00
James Almer
fa5e71a815 configure: add missing pthreads extralib to the libilbc check
Debugged with the help of Reino Wijnsma.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-13 19:50:43 -03:00
James Almer
854c4e974d configure: add a -lstdc++ flag to the some external library checks
Two of them are missing it in their pkg-config file, so adding it
here is a workaround until said pkg-config files are fixed.

Debugged with the help of Reino Wijnsma.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-13 19:49:56 -03:00
Daniel Kucera
feed201849 libavformat/wtvdec: return AVERROR_EOF on EOF
Signed-off-by: Daniel Kucera <daniel.kucera@gmail.com>
Signed-off-by: wm4 <nfxjfg@googlemail.com>
2017-10-13 17:23:54 +02:00
James Almer
6b52c0b583 configure: add missing zlib extralibs to the libmysofa check
Should fix checks with static builds.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-13 11:22:54 -03:00
James Almer
15dc897582 configure: list libv4l2 as an optional library for v4l2
Fixes regression since 6dfcbd80ad
and 734ed38931.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-13 10:24:09 -03:00
Gyan Doshi
147c1e008a doc/filters: correct typo and incomplete desc.
Correct typo in signalstats filter section and qualify description for variable
in select filter.

Signed-off-by: Gyan Doshi <gyandoshi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-13 02:46:31 +02:00
Kaustubh Raste
e5439e272e avcodec/mips: Improve hevc uni weighted vert mc msa functions
Pack the data to half word before clipping.
Use immediate unsigned saturation for clip to max saving one vector register.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-13 02:46:31 +02:00
Kaustubh Raste
6ca821a3e7 avcodec/mips: Improve hevc uni horiz mc msa functions
Update macros to remove adds.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-13 02:46:31 +02:00
Kaustubh Raste
e63758468c avcodec/mips: Improve hevc bi copy mc msa functions
Load the specific destination bytes instead of MSA load and pack.
Use immediate unsigned saturation for clip to max saving one vector register.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-13 02:46:31 +02:00
Kaustubh Raste
e549933a27 avcodec/mips: Improve avc put mc 12, 32 and 22 msa functions
Remove loops and unroll as block sizes are known.
Removed unused functions.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-13 02:46:31 +02:00
Kaustubh Raste
27a0a83880 avcodec/mips: Improve avc chroma avg horiz mc msa functions
Replace generic with block size specific function.
Load the specific destination bytes instead of MSA load and pack.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-13 02:46:31 +02:00
James Almer
34dbee9f60 configure: explicitly list videotoolbox deps for avutil
There's a bug in configure where they are not being resolved right,
so make them explicit deps for avutil for now.
2017-10-12 21:04:26 -03:00
Luca Barbato
abb5efca26 configure: Fix sem_timedwait probe
(cherry-picked from libav commit 41262498ff)
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-12 20:28:10 -03:00
James Almer
4440bcf6a0 configure: fix pthread_cancel check
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-12 20:24:36 -03:00
James Almer
9c0279bc2c configure: fix CoreGraphics module name
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-12 20:05:39 -03:00
Clément Bœsch
d1aef7d08a lavc/pixlet: remove unecessary intermediate nb_levels variable
This is a change imported from Libav.
2017-10-13 00:25:14 +02:00
Clément Bœsch
368fb74831 lavc/pixlet: reduce diff with Libav (cosmetics only) 2017-10-13 00:25:14 +02:00
James Almer
4b175913be build: fix builds configured with a suffix
Regression since 6dfcbd80ad

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-12 19:15:42 -03:00
Ivan Kalvachev
3a6ded7cfc Fix crash if av_vdpau_bind_context() is not used.
The public functions av_alloc_vdpaucontext() and
av_vdpau_alloc_context() are allocating AVVDPAUContext
structure that is supposed to be placed in avctx->hwaccel_context.

However the rest of libavcodec/vdpau.c uses avctx->hwaccel_context
as struct VDPAUHWContext, that is bigger and does contain
AVVDPAUContext as first member.

The usage includes write to the new variables in the bigger stuct,
without checking for block size.

Fix by always allocating the bigger structure.

Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
2017-10-13 00:13:17 +02:00
Carl Eugen Hoyos
c87bb9c04a lavc/ppc/fft_init: Fix compilation on ppc64le with --disable-vsx. 2017-10-12 23:14:55 +02:00
James Almer
fb934f23e1 Merge commit '57b753b445e23363c997a8ec1c556e0b0f6e9da3'
* commit '57b753b445e23363c997a8ec1c556e0b0f6e9da3':
  build: Prefer NASM assembler over YASM
  build: Make x86 assembler commandline-selectable
  build: Special-case handling of SDL CFLAGS

This commit is a noop, see
fde3bb16f9
3cc73d3d6d
4f9297ac3b

Merged-by: James Almer <jamrial@gmail.com>
2017-10-12 18:09:11 -03:00
James Almer
583003670f Merge commit '003124ebf4a05f1347c74104216887ddd2e5aad4'
* commit '003124ebf4a05f1347c74104216887ddd2e5aad4':
  build: Fix logic of clock_gettime() check

Merged-by: James Almer <jamrial@gmail.com>
2017-10-12 17:52:43 -03:00
James Almer
4226c57b2b configure: add missing libfontconfig and libfreetype dependencies to showcqt filter
Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-12 17:36:58 -03:00
James Almer
c54431354a Merge commit 'b44bd7ee7f7d834c1e22b5f33674393e5c0267c5'
* commit 'b44bd7ee7f7d834c1e22b5f33674393e5c0267c5':
  pixlet: Fix architecture-dependent code and values

This commit is a noop, see a6b1180e39

Merged-by: James Almer <jamrial@gmail.com>
2017-10-12 15:03:23 -03:00
James Almer
e4ad3e6f64 Merge commit '808ef43597b1e3d6e69a5b9abe2237c8ddb97b44'
* commit '808ef43597b1e3d6e69a5b9abe2237c8ddb97b44':
  build: Explicitly set 32-bit/64-bit object formats for nasm/yasm

See d44935cbf4

Merged-by: James Almer <jamrial@gmail.com>
2017-10-12 14:58:34 -03:00
James Almer
6fb580e7d3 configure: fix libxavs check
libxavs may require pthreads and libm at link time, and without
said ldflags available as global extralibs, the check will fail.

Regression since 6dfcbd80ad.

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-12 14:20:30 -03:00
James Almer
b78bb51a7c Merge commit '6eef263aca281fb582e1fa3d841ac20ef747a252'
* commit '6eef263aca281fb582e1fa3d841ac20ef747a252':
  x86: Merge align directives into SECTION_RODATA declarations where possible

Merged-by: James Almer <jamrial@gmail.com>
2017-10-12 13:48:35 -03:00
James Almer
65c11f1bba Merge commit '3303f86467efa99f23c670707f5be094cc9ce547'
* commit '3303f86467efa99f23c670707f5be094cc9ce547':
  nvenc: Remove qmin and qmax constraints for nvenc vbr

[10:06:59 CEST] <BtbN> jamrial, 3303f86467 is a no-op. NV_ENC_PARAMS_RC_2_PASS_VBR is a deprecated rc mode(http://git.videolan.org/?p=ffmpeg.git;a=blob;f=compat/nvenc/nvEncodeAPI.h;h=c3a829421282d5f22f82fc285723f13eb660f053;hb=HEAD#l268).
[10:07:14 CEST] <BtbN> And the first hunk with qmin/qmax was applied to ffmpeg quite a while ago already.
[10:07:49 CEST] <BtbN> In a slightly different fashion, but with the same effect
[10:07:58 CEST] <BtbN> Came as a patch from nvidia iirc

Merged-by: James Almer <jamrial@gmail.com>
2017-10-12 13:39:39 -03:00
James Almer
25bd2f4f36 configure: add missing OpenCL dependency to libavutil
Tested-by: wm4
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-12 12:27:48 -03:00
Carl Eugen Hoyos
ce508f0bcc lavc/proresdec2: Do not mix variable declaration and statement.
Fixes ticket #6728.
2017-10-12 12:43:09 +02:00
James Almer
734ed38931 configure: fix dependencies for v4l2_indev
There's no indev named libv4l2.

Fixes ticket #6729

Reviewed-by: bermond
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-11 22:25:02 -03:00
Ivan Kalvachev
9054439bad Fix visual glitch with XvMC, caused by wrong idct permutation.
In the past XvMC forced simple_idct since
it was using FF_IDCT_PERM_NONE.
However now we have SIMD variants of simple_idct that
are using FF_IDCT_PERM_TRANSPOSE and if they are selected
XvMC would get coefficients in the wrong order.

The patch creates new FF_IDCT_NONE that
is used only for this kind of hardware decoding
and that fallbacks to the old C only simple idct.

Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-12 01:27:52 +02:00
Sasi Inguva
2b006ccf83 ffmpeg.c: Fallback to duration_dts, when duration_pts can't be determined.
This is required for FLV files, for which duration_pts comes out to be zero.

Signed-off-by: Sasi Inguva <isasi@google.com>
Reviewed-by: Thomas Mundt <tmundt75@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-12 01:27:52 +02:00
James Almer
37caed7774 Merge commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8'
* commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8':
  Add Apple Pixlet decoder
  libavutil: add av_mod_uintp2
  intmath: add faster clz support

This commit is a noop, see
0dd8a3d71e
d13e521cc8
73651090ca

Merged-by: James Almer <jamrial@gmail.com>
2017-10-11 19:44:56 -03:00
James Almer
ef7766befd fate: add missing closing bracket
Regression since 85e2fe6281

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-11 19:35:56 -03:00
James Almer
7d2882bf52 Merge commit '5ff3b5cafcc685b6936d16602b0f80aa09a95870'
* commit '5ff3b5cafcc685b6936d16602b0f80aa09a95870':
  build: Add pthreads to list of avutil extralibs

This commit is a noop, see 6dfcbd80ad

Merged-by: James Almer <jamrial@gmail.com>
2017-10-11 19:05:58 -03:00
James Almer
85e2fe6281 Merge commit 'db869f4ea4405fb8f9736e5ecdca70f77621a28e'
* commit 'db869f4ea4405fb8f9736e5ecdca70f77621a28e':
  fate: Add build-only targets to FATE

Merged-by: James Almer <jamrial@gmail.com>
2017-10-11 19:02:04 -03:00
James Almer
9908eac218 Merge commit '3c0efbd03349ae68d3a25a082222652a102e3fd4'
* commit '3c0efbd03349ae68d3a25a082222652a102e3fd4':
  build: Allow generating dependencies as a side-effect of assembling
  build: Generalize yasm/nasm-related variable names

This commit is a noop, see
fd502f4f5f
0cc0c5b6db

Merged-by: James Almer <jamrial@gmail.com>
2017-10-11 18:40:29 -03:00