ffmpeg.git
2 years agoMerge commit 'ed3b2a999d189771c9b0ada9a9200117595fa474'
James Almer [Tue, 7 Nov 2017 21:12:17 +0000 (18:12 -0300)]
Merge commit 'ed3b2a999d189771c9b0ada9a9200117595fa474'

* commit 'ed3b2a999d189771c9b0ada9a9200117595fa474':
  cinepakenc: misc small changes
  cinepakenc: K&R formatting cosmetics
  cinepakenc: Stop using AVPicture
  cinepakenc: Drop broken debug code
  cinepakenc: add option handling for flexibility
  cinepakenc: fixes and improvements
  Add Cinepak encoder

See
59dbc36f49db5cfd9d2ad4b00ef2e3336173ee8d
762c4dc082764896e27f3c53c14a65871d8fe910
bf23642dcc86890fa2e32697c3b930b3f1ac0d88
0ab25dac2f0b170ecc0e37530cf15f83b9f9e56d

Merged-by: James Almer <jamrial@gmail.com>
2 years agocompat/w32dlfcn: add missing config.h include
James Almer [Tue, 7 Nov 2017 19:38:59 +0000 (16:38 -0300)]
compat/w32dlfcn: add missing config.h include

Fixes warnings about undefined HAVE_WINRT

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '4d330da006fe48178a4c8047f06270925eaedf63'
James Almer [Tue, 7 Nov 2017 19:29:02 +0000 (16:29 -0300)]
Merge commit '4d330da006fe48178a4c8047f06270925eaedf63'

* commit '4d330da006fe48178a4c8047f06270925eaedf63':
  os_support: Use HAVE_UWP instead of manually checking WINAPI_FAMILY
  d3d11va: Check WINAPI_FAMILY instead of HAVE_LOADLIBRARY
  lavf: Remove codec_tag from dashenc and smoothstreamingenc
  hevc: Add support for alternative transfer characterics SEI

Merged-by: James Almer <jamrial@gmail.com>
2 years agoconfigure: libvmaf is not GPLv2-compatible.
Carl Eugen Hoyos [Mon, 6 Nov 2017 13:15:31 +0000 (14:15 +0100)]
configure: libvmaf is not GPLv2-compatible.

It is licensed under Apache 2.0.

2 years agoavcodec/mips: Improve hevc bi 4 tap hv mc msa functions
Kaustubh Raste [Mon, 6 Nov 2017 05:45:04 +0000 (11:15 +0530)]
avcodec/mips: Improve hevc bi 4 tap hv mc msa functions

Use global mask buffer for appropriate mask load.
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>
2 years agoavcodec/mips: Improve avc avg mc 10, 30, 01 and 03 msa functions
Kaustubh Raste [Mon, 6 Nov 2017 05:19:23 +0000 (10:49 +0530)]
avcodec/mips: Improve avc avg mc 10, 30, 01 and 03 msa functions

Align the mask buffer to 64 bytes.
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>
2 years agolibavcodec/mepgvideo : remove warning introduce by previous patch
Martin Vignali [Mon, 6 Nov 2017 22:59:00 +0000 (23:59 +0100)]
libavcodec/mepgvideo : remove warning introduce by previous patch

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agolibavcodec/lossless_video_dsp : cosmetic add better separator for each function,...
Martin Vignali [Mon, 6 Nov 2017 20:52:37 +0000 (21:52 +0100)]
libavcodec/lossless_video_dsp : cosmetic add better separator for each function, in order to make reading of the asm file easier

2 years agolibavcodec/lossless_videodsp : add add_bytes avx2 version
Martin Vignali [Mon, 6 Nov 2017 20:51:54 +0000 (21:51 +0100)]
libavcodec/lossless_videodsp : add add_bytes avx2 version

2 years agocheckasm/llviddsp : add test for other dsp func
Martin Vignali [Sun, 29 Oct 2017 17:01:30 +0000 (18:01 +0100)]
checkasm/llviddsp : add test for other dsp func

add_median_pred
add_left_pred : add two func one with acc 0, and one with random acc
add_left_pred16

2 years agofate/utvideo : add test for decoding and encoding
Martin Vignali [Sat, 28 Oct 2017 12:06:22 +0000 (14:06 +0200)]
fate/utvideo : add test for decoding and encoding

2 years agolibavcodec/utvideo : simplify decode_plane
Martin Vignali [Sat, 28 Oct 2017 15:12:58 +0000 (17:12 +0200)]
libavcodec/utvideo : simplify decode_plane

the func is only call with step = 1
no need to pass it in the func

2 years agolibavcodec/blockdsp : fix comment. clear_block need 32 aligned now
Martin Vignali [Sat, 21 Oct 2017 16:47:49 +0000 (18:47 +0200)]
libavcodec/blockdsp : fix comment. clear_block need 32 aligned now

2 years agoavutil/pixdesc: remove reference to avcodec_get_chroma_sub_sample
Martin Vignali [Mon, 6 Nov 2017 21:39:17 +0000 (22:39 +0100)]
avutil/pixdesc: remove reference to avcodec_get_chroma_sub_sample

Don't recommend to use deprecated functions.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec: remove remaining uses of avcodec_get_chroma_sub_sample
Martin Vignali [Mon, 6 Nov 2017 21:39:16 +0000 (22:39 +0100)]
avcodec: remove remaining uses of avcodec_get_chroma_sub_sample

Replace them with av_pix_fmt_get_chroma_sub_sample.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'a594f17f83a1ffdc1eec18818208fe39487dd5d7'
James Almer [Mon, 6 Nov 2017 21:46:05 +0000 (18:46 -0300)]
Merge commit 'a594f17f83a1ffdc1eec18818208fe39487dd5d7'

* commit 'a594f17f83a1ffdc1eec18818208fe39487dd5d7':
  dvbsubdec: Free subrect memory on allocation error
  dvbsubdec: Fixed segfault when decoding subtitles

See
fbb59a3bf4c8668197521b3db5f26d0e93aed1a6
39dfe6801a3f67c2964a829b65e8e38e3cb22217

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3fdf50f9e864c88da2139cf066832944de81acaa'
James Almer [Mon, 6 Nov 2017 21:30:48 +0000 (18:30 -0300)]
Merge commit '3fdf50f9e864c88da2139cf066832944de81acaa'

* commit '3fdf50f9e864c88da2139cf066832944de81acaa':
  hwframe: Allow hwaccel frame allocators to align surface sizes
  dxva: verbose-log decoder GUID list
  hwcontext_d3d11va: add option to enable debug mode
  dxva: support DXGI_FORMAT_420_OPAQUE decoding
  hwcontext_d3d11va: allocate staging texture lazily
  hwcontext_d3d11va: fix crash on frames_init failure
  dxva: fix some warnings
  dxva: add declarative profile checks

This commit is a noop, see
e2afcc33e0bcba92ab6c767f09f17a67911a4928
39f201a0ec7913f7509a01fb0fa6634a24e52203
1509d739a036b9838e12f28dac9f09ac37bc3928
6f5ff3269b12776a32b12887128ba034ad86e08b
8d7fdba7b8670db9dd5023dde6fe3a06674933c4
289d387330d8a0a07ff98c9e09215627a70ace2d
f0bcedaf37ed4fdb082c88826b8bd3a5dd26382a
d14179e3d49eb0f2533db16151e01abb0018b165

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '0e83e95c60892747f2f1bd8382f915f2397f99a5'
James Almer [Mon, 6 Nov 2017 21:14:15 +0000 (18:14 -0300)]
Merge commit '0e83e95c60892747f2f1bd8382f915f2397f99a5'

* commit '0e83e95c60892747f2f1bd8382f915f2397f99a5':
  configure: Reset X86ASM_DEP(FLAGS) when probing for the assembler program

See f66086adac5eb9b964c89ea0480487f48875f690

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '7cb053e4ddf258e2dbf52ccc586548680742d758'
James Almer [Mon, 6 Nov 2017 21:10:49 +0000 (18:10 -0300)]
Merge commit '7cb053e4ddf258e2dbf52ccc586548680742d758'

* commit '7cb053e4ddf258e2dbf52ccc586548680742d758':
  nvenc: Minimize the surface allocation
  nvenc: Use a fifo to manage the free surface pool
  nvenc: Add an explicit auto alias

This commit is a noop, see
7b0689c55f1f8ee3abca58e1e3522f1c33beb60b
8de3458a07376b0a96772e586b6dba5e93432f52
de2faec2faf34ee948d400101299d4ccdc1f3a50

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '857e26b655a769e5a56bada1a0d9adb44cc176b7'
James Almer [Mon, 6 Nov 2017 20:55:26 +0000 (17:55 -0300)]
Merge commit '857e26b655a769e5a56bada1a0d9adb44cc176b7'

* commit '857e26b655a769e5a56bada1a0d9adb44cc176b7':
  build: Add an option for passing linker flags to the shared library build

See e34a3468f294f21878875e0f6ad5564cd52af70e.

--extra-ldlibflags is left in place for compatibility reasons.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c'
James Almer [Mon, 6 Nov 2017 20:50:00 +0000 (17:50 -0300)]
Merge commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c'

* commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c':
  configure: Automatically add -isysroot for darwin if --sysroot is specified

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f519e131c101ae3948dabf1f7f598efbff5fb536'
James Almer [Mon, 6 Nov 2017 20:45:31 +0000 (17:45 -0300)]
Merge commit 'f519e131c101ae3948dabf1f7f598efbff5fb536'

* commit 'f519e131c101ae3948dabf1f7f598efbff5fb536':
  af_bs2b: Add missing casts to complex pointer assignments

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavformat/ty: do not overread chunk
Paul B Mahol [Mon, 6 Nov 2017 20:00:08 +0000 (21:00 +0100)]
avformat/ty: do not overread chunk

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavformat/ty: try harder to find stream signature
Paul B Mahol [Mon, 6 Nov 2017 19:50:16 +0000 (20:50 +0100)]
avformat/ty: try harder to find stream signature

Search all chunks, not just first one.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavformat/rtpdec_asf: free the buffer pointed by the AVIOContext
James Almer [Mon, 6 Nov 2017 16:25:18 +0000 (13:25 -0300)]
avformat/rtpdec_asf: free the buffer pointed by the AVIOContext

Don't free the buffer allocated in ff_wms_parse_sdp_a_line() after
calling avformat_open_input(), as it may free it and replace it with
another one.

Should fix ticket #6808

Tested-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat: add TiVo ty demuxer
Paul B Mahol [Sun, 29 Oct 2017 20:20:10 +0000 (21:20 +0100)]
avformat: add TiVo ty demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavfilter:vf_libvmaf: improve docs.
Ashish Pratap Singh [Mon, 6 Nov 2017 12:49:33 +0000 (07:49 -0500)]
avfilter:vf_libvmaf: improve docs.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2 years agoavfilter/vf_libvmaf: fix errors while running with psnr=1.
Ashish Pratap Singh [Mon, 6 Nov 2017 12:49:19 +0000 (07:49 -0500)]
avfilter/vf_libvmaf: fix errors while running with psnr=1.

This patch fixes the seg fault which ocuured while running libvmaf filter
with option psnr=1.

Signed-off-by: ashk43712 <ashk43712@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2 years agolavf/amr: Do not set codec_tag for raw amr_nb and raw amr_wb.
Carl Eugen Hoyos [Mon, 6 Nov 2017 12:36:40 +0000 (13:36 +0100)]
lavf/amr: Do not set codec_tag for raw amr_nb and raw amr_wb.

2 years agoffplay: use SDL2 audio API
Marton Balint [Sat, 4 Nov 2017 18:31:54 +0000 (19:31 +0100)]
ffplay: use SDL2 audio API

It allows us to specify what kind of audio parameter changes are allowed.

Should fix ticket #6721.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoMaintainers : add myself for exr
Martin Vignali [Sat, 4 Nov 2017 14:17:28 +0000 (15:17 +0100)]
Maintainers : add myself for exr

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/sbrdsp_fixed: Fix integer overflow in shift in sbr_hf_g_filt_c()
Michael Niedermayer [Wed, 1 Nov 2017 13:00:20 +0000 (14:00 +0100)]
avcodec/sbrdsp_fixed: Fix integer overflow in shift in sbr_hf_g_filt_c()

Fixes: runtime error: shift exponent 66 is too large for 64-bit type 'long long'
Fixes: 3642/clusterfuzz-testcase-minimized-5443853801750528

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/aacsbr_fixed: Fix division by zero in sbr_gain_calc()
Michael Niedermayer [Wed, 1 Nov 2017 13:00:19 +0000 (14:00 +0100)]
avcodec/aacsbr_fixed: Fix division by zero in sbr_gain_calc()

Fixes: 3642/clusterfuzz-testcase-minimized-5443853801750528

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavutil/softfloat: Add FLOAT_MIN
Michael Niedermayer [Wed, 1 Nov 2017 13:00:18 +0000 (14:00 +0100)]
avutil/softfloat: Add FLOAT_MIN

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/h264idct_template: Fix integer overflows in ff_h264_idct8_add()
Michael Niedermayer [Sat, 4 Nov 2017 00:19:20 +0000 (01:19 +0100)]
avcodec/h264idct_template: Fix integer overflows in ff_h264_idct8_add()

Fixes: runtime error: signed integer overflow: -503316480 + -2013265038 cannot be represented in type 'int'
Fixes: 3805/clusterfuzz-testcase-minimized-6578427831255040

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolavf/amr: Add amrnb and amrwb demuxers.
Carl Eugen Hoyos [Sun, 5 Nov 2017 19:51:03 +0000 (20:51 +0100)]
lavf/amr: Add amrnb and amrwb demuxers.

Fixes ticket #6678.

2 years agolavc/v4l2_context: Change the type of the ioctl cmd to uint32_t.
Carl Eugen Hoyos [Sun, 5 Nov 2017 00:53:49 +0000 (01:53 +0100)]
lavc/v4l2_context: Change the type of the ioctl cmd to uint32_t.

Fixes a warning on recent Linux:
libavcodec/v4l2_context.c: In function 'ff_v4l2_context_set_status':
libavcodec/v4l2_context.c:496:26: warning: comparison is always false due to limited range of data type

2 years agoavcodec/qdrw: support 16bpp files with bppcnt == 2 && bpp == 8
Piotr Bandurski [Wed, 22 Mar 2017 19:34:28 +0000 (20:34 +0100)]
avcodec/qdrw: support 16bpp files with bppcnt == 2 && bpp == 8

2 years agoavformat/mvdec: check for EOF
Paul B Mahol [Sun, 5 Nov 2017 09:39:23 +0000 (10:39 +0100)]
avformat/mvdec: check for EOF

Fixes #6805.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoffmpeg.c: fix code style in seek_to_start
Peter Große [Sun, 29 Oct 2017 14:07:12 +0000 (15:07 +0100)]
ffmpeg.c: fix code style in seek_to_start

Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoffmpeg.c: fix calculation of input file duration in seek_to_start()
Peter Große [Sun, 29 Oct 2017 11:08:05 +0000 (12:08 +0100)]
ffmpeg.c: fix calculation of input file duration in seek_to_start()

Fixes looping files without audio or when using stream_copy, where
ist->nb_samples is not set since no decoding is done.

This fixes ticket #5719 and also fixes an endless loop with the sample
in ticket #6139.

Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mips: Improve hevc uni weighted 4 tap hz mc msa functions
Kaustubh Raste [Fri, 3 Nov 2017 07:35:23 +0000 (13:05 +0530)]
avcodec/mips: Improve hevc uni weighted 4 tap hz mc msa functions

Use global mask buffer for appropriate mask load.
Use immediate unsigned saturation for clip to max saving one vector register.
Remove unused macro.

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>
2 years agoavcodec/mips: Improve hevc uni 4 tap hz and vt mc msa functions
Kaustubh Raste [Fri, 3 Nov 2017 06:59:58 +0000 (12:29 +0530)]
avcodec/mips: Improve hevc uni 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>
2 years agoavcodec/xan: Check for bitstream end in xan_huffman_decode()
Michael Niedermayer [Fri, 3 Nov 2017 16:48:29 +0000 (17:48 +0100)]
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>
2 years agoavcodec/exr: fix undefined shift in pxr24_uncompress()
Michael Niedermayer [Sat, 4 Nov 2017 00:19:19 +0000 (01:19 +0100)]
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>
2 years agoRevert "vc2enc: Calculate average slice quantiser correctly"
Kieran Kunhya [Sat, 4 Nov 2017 18:31:59 +0000 (18:31 +0000)]
Revert "vc2enc: Calculate average slice quantiser correctly"

This reverts commit 626d200e76e15487cff20992256a55919432b0b3.

2 years agoffplay: only use hardware accelerated SDL texture formats
Marton Balint [Sat, 28 Oct 2017 20:46:08 +0000 (22:46 +0200)]
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
3bd2228d05a05eab5f91ac00b01efac9cb07649b.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoffplay: create the window and the renderer before starting playback
Marton Balint [Sat, 28 Oct 2017 20:06:22 +0000 (22:06 +0200)]
ffplay: create the window and the renderer before starting playback

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agovc2enc: Calculate average slice quantiser correctly
Kieran Kunhya [Mon, 24 Jul 2017 18:25:41 +0000 (19:25 +0100)]
vc2enc: Calculate average slice quantiser correctly

2 years agoh264: Make Truncating SPS/PPS message debug.
Kieran Kunhya [Wed, 30 Aug 2017 13:38:46 +0000 (14:38 +0100)]
h264: Make Truncating SPS/PPS message debug.

2 years agoh2645_parse: Allocate a single buffer per packet
Kieran Kunhya [Sat, 4 Nov 2017 17:41:06 +0000 (17:41 +0000)]
h2645_parse: Allocate a single buffer per packet

Drastically reduces memory usage on pathological streams.
Fixes ticket #6789

2 years agolavc/alac: Avoid allocating huge memory blocks for malicious alac input.
Carl Eugen Hoyos [Wed, 1 Nov 2017 14:14:22 +0000 (15:14 +0100)]
lavc/alac: Avoid allocating huge memory blocks for malicious alac input.

2 years agoavcodec/mips: Improve hevc bi wgt 4 tap hz and vt mc msa functions
Kaustubh Raste [Fri, 3 Nov 2017 06:29:08 +0000 (11:59 +0530)]
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>
2 years agoavcodec/mips: Improve hevc bi 4 tap hz and vt mc msa functions
Kaustubh Raste [Fri, 3 Nov 2017 05:37:08 +0000 (11:07 +0530)]
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>
2 years agoavcodec/mips: Improve avc avg mc 20, 21 and 23 msa functions
Kaustubh Raste [Fri, 3 Nov 2017 05:09:18 +0000 (10:39 +0530)]
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>
2 years agolavf/mov.c: Refine edit list start seek, based on PTS computed from CTTS.
Sasi Inguva [Fri, 3 Nov 2017 00:33:28 +0000 (17:33 -0700)]
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>
2 years agofate: Fix fitsdec-gbrap16 test on big-endian hardware.
Carl Eugen Hoyos [Wed, 1 Nov 2017 20:39:33 +0000 (21:39 +0100)]
fate: Fix fitsdec-gbrap16 test on big-endian hardware.

2 years agoavfilter/vf_tile: remove limit of max tile size
Paul B Mahol [Tue, 10 Oct 2017 19:18:03 +0000 (21:18 +0200)]
avfilter/vf_tile: remove limit of max tile size

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agosnowenc: fix use of deprecated API
Nicolas Frattaroli [Thu, 2 Nov 2017 19:12:48 +0000 (20:12 +0100)]
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>
2 years agodiracdec: fix deprecated API usage
Nicolas Frattaroli [Thu, 2 Nov 2017 22:39:53 +0000 (23:39 +0100)]
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>
2 years agoMerge commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888'
James Almer [Fri, 3 Nov 2017 02:39:28 +0000 (23:39 -0300)]
Merge commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888'

* commit 'eb061ad6fd0e3cea7cf7cfbff0749bc90dd7d888':
  tls_gnutls: Readd support for nonblocking operation

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '0671eb2346c17e8fb13784cf90ce416661fdea1c'
James Almer [Fri, 3 Nov 2017 02:27:53 +0000 (23:27 -0300)]
Merge commit '0671eb2346c17e8fb13784cf90ce416661fdea1c'

* commit '0671eb2346c17e8fb13784cf90ce416661fdea1c':
  tls_openssl: Readd support for nonblocking operation

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavformat/tls_openssl: move some functions up in the file
James Almer [Fri, 3 Nov 2017 02:26:46 +0000 (23:26 -0300)]
avformat/tls_openssl: move some functions up in the file

Cosmetic change, reduces differences with libav.

2 years agoMerge commit '84ab1cc437fa47a00532f305b9fe15b5b66c8c5e'
James Almer [Fri, 3 Nov 2017 00:57:01 +0000 (21:57 -0300)]
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
998609ddb8884fd0f33abdb74c8bd4e1234032b1
95f3c85976ff79af6fd10ce3f7a90fcb054c3fc0
e199d90da6473abc0d010797b14f2ae2c9811d34
38d808d72e393f9a769ef1543a7eff15fadc1980
974d508e571085dce43e688595da058804169088
369a3e111cb8015c3a3acc5c2c15728c8f37084f

Merged-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/gdv: Check compression before allocating frame
Michael Niedermayer [Wed, 1 Nov 2017 19:02:59 +0000 (20:02 +0100)]
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 0561bd2fc2bff0dbe651d5998e9f129c43d25eb3 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>
2 years agoavcodec/mips: Improve hevc uni weighted hv mc msa functions
Kaustubh Raste [Tue, 31 Oct 2017 13:00:40 +0000 (18:30 +0530)]
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>
2 years agoavcodec/mips: Improve avc avg mc 02, 12 and 32 msa functions
Kaustubh Raste [Wed, 1 Nov 2017 06:06:25 +0000 (11:36 +0530)]
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>
2 years agoavformat/hlsenc: reindent hlsenc code
Steven Liu [Thu, 2 Nov 2017 14:30:06 +0000 (22:30 +0800)]
avformat/hlsenc: reindent hlsenc code

Signed-off-by: Steven Liu <lq@onvideo.cn>
2 years agoavformat/hlsenc: check hls segment mode for ignore the init filename
Steven Liu [Thu, 2 Nov 2017 14:29:28 +0000 (22:29 +0800)]
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>
2 years agolavfi/framepool: use av_image_check_size2().
Nicolas George [Wed, 1 Nov 2017 20:38:39 +0000 (21:38 +0100)]
lavfi/framepool: use av_image_check_size2().

Allow filters to handle larger frames.

2 years agolavfi: check links properties after configuring them.
Nicolas George [Wed, 1 Nov 2017 20:15:00 +0000 (21:15 +0100)]
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.

2 years agoMerge commit 'fd1ffa1f10e940165035ccb79d4a6523da196062'
James Almer [Thu, 2 Nov 2017 00:02:02 +0000 (21:02 -0300)]
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 3125a4a8a8fc7dde938bff6a668f53b26bf47860

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'c2b0bea40f1fd4399ff6184a2df4f397c0f4b3ab'
James Almer [Wed, 1 Nov 2017 23:58:26 +0000 (20:58 -0300)]
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
6dfcbd80ad446ff163b47f2bf432bbf706436ea8
d984b29b21f6442fb6a809c08c07533dd496b1f9
70808859ddf4c636472b56f5ec637c4754276867
f434ddf48e084a7a5631e7a9dd1d9771d97e114c

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '7b1f9873be2f9d5aea2762c9197ff46df82768dc'
James Almer [Wed, 1 Nov 2017 23:56:07 +0000 (20:56 -0300)]
Merge commit '7b1f9873be2f9d5aea2762c9197ff46df82768dc'

* commit '7b1f9873be2f9d5aea2762c9197ff46df82768dc':
  build: Adjust dependencies for faan(i)dct components

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '635897ac78ef29869f0321ab921c91b3e1aad453'
James Almer [Wed, 1 Nov 2017 23:51:03 +0000 (20:51 -0300)]
Merge commit '635897ac78ef29869f0321ab921c91b3e1aad453'

* commit '635897ac78ef29869f0321ab921c91b3e1aad453':
  configure: Factorize qsv dependencies

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'c599c43fa147d7a001cdbf8f3b7da0a965f2e285'
James Almer [Wed, 1 Nov 2017 23:39:37 +0000 (20:39 -0300)]
Merge commit 'c599c43fa147d7a001cdbf8f3b7da0a965f2e285'

* commit 'c599c43fa147d7a001cdbf8f3b7da0a965f2e285':
  configure: Add missing arch dependencies for arch extensions

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6'
James Almer [Wed, 1 Nov 2017 23:33:47 +0000 (20:33 -0300)]
Merge commit '9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6'

* commit '9d12dd6fa84d9f6094bdf0fdae62527ecec0bbb6':
  configure: Add x86 dependency for mmx_internal

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '2f792cb6703b5b12f2e873bee13f33da8aa9940a'
James Almer [Wed, 1 Nov 2017 23:33:02 +0000 (20:33 -0300)]
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
52f954da7594c31ad94c9bcb54290145b59b27f5
155f071bad5a06364f42a4533b352a85a1451d97

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '4993a68f0f9285f92a42a54305dc0244665b7db4'
James Almer [Wed, 1 Nov 2017 23:24:14 +0000 (20:24 -0300)]
Merge commit '4993a68f0f9285f92a42a54305dc0244665b7db4'

* commit '4993a68f0f9285f92a42a54305dc0244665b7db4':
  hwcontext: Mark local table static const
  libfdk-aacdec: Correct buffer_size parameter

This commit is a noop, see
ca6776a993903dbcfef5ae8a18556c40ecf83e1c
0b1794a43e1083644aa3db2a09323681cfe080ec

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '04f691cd4fb7d226e54df886a21ba201cb5019f4'
James Almer [Wed, 1 Nov 2017 23:21:35 +0000 (20:21 -0300)]
Merge commit '04f691cd4fb7d226e54df886a21ba201cb5019f4'

* commit '04f691cd4fb7d226e54df886a21ba201cb5019f4':
  mmal: Add missing .item_name to AVClass declaration

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'e2edf1529cb35eaf043e3f8e5cba498ed06e2563'
James Almer [Wed, 1 Nov 2017 23:18:54 +0000 (20:18 -0300)]
Merge commit 'e2edf1529cb35eaf043e3f8e5cba498ed06e2563'

* commit 'e2edf1529cb35eaf043e3f8e5cba498ed06e2563':
  configure: Simplify AltiVec/VSX check with a helper function

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'd76479c5020ca43e67d47ba3767146b192dc4782'
James Almer [Wed, 1 Nov 2017 23:15:43 +0000 (20:15 -0300)]
Merge commit 'd76479c5020ca43e67d47ba3767146b192dc4782'

* commit 'd76479c5020ca43e67d47ba3767146b192dc4782':
  ppc: Drop support for Apple GCC

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '97cfe1d8bd1968143e2ba9aa46ebe9504a835e24'
James Almer [Wed, 1 Nov 2017 23:05:09 +0000 (20:05 -0300)]
Merge commit '97cfe1d8bd1968143e2ba9aa46ebe9504a835e24'

* commit '97cfe1d8bd1968143e2ba9aa46ebe9504a835e24':
  Convert all AVClass struct declarations to designated initializers.

Merged-by: James Almer <jamrial@gmail.com>
2 years agolavf/img2enc: remove redundant option 'updatefirst'
Gyan Doshi [Sun, 29 Oct 2017 07:53:18 +0000 (13:23 +0530)]
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.

2 years agoMerge commit '98ea98069b40c34aa7b762096f8f380012a7dd84'
James Almer [Wed, 1 Nov 2017 21:51:40 +0000 (18:51 -0300)]
Merge commit '98ea98069b40c34aa7b762096f8f380012a7dd84'

* commit '98ea98069b40c34aa7b762096f8f380012a7dd84':
  nvenc: Add default value for AVCodecContext::refs

This commit is a noop, see d8da329cc364b36dabbb3162f788f958d8b6ea46

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f9e7a2f95a7194a8736cc1416a03a1a0155a3e9f'
James Almer [Wed, 1 Nov 2017 21:46:44 +0000 (18:46 -0300)]
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
3303511f33dcc1b708fc18072cd93bca62196676
865360ba633b09f1292d52ba6d07f16b6bcef6df
ab28108a361196134704071b7b34c42fc7d747c7
5659f7404731415c7e1cfdf4d8b0afeb6b1132de
70143a3954e1c4412efb2bf1a3a818adea2d3abf

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'ed434be106a4615e0419b3ac7664220741afda2d'
James Almer [Wed, 1 Nov 2017 21:45:23 +0000 (18:45 -0300)]
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
6dfcbd80ad446ff163b47f2bf432bbf706436ea8
5cae5a1defa360da076365a786093a749d1ddf4e
4600b0619afc58b58de1a21d7a2c472e0d788282

Merged-by: James Almer <jamrial@gmail.com>
2 years agolavc/ppc/hpeldsp_altivec: Remove declaration of two unused variables.
Carl Eugen Hoyos [Wed, 1 Nov 2017 21:41:09 +0000 (22:41 +0100)]
lavc/ppc/hpeldsp_altivec: Remove declaration of two unused variables.

2 years agoavcodec/dca: return standard error codes in avpriv_dca_parse_core_frame_header()
James Almer [Tue, 31 Oct 2017 03:36:32 +0000 (00:36 -0300)]
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>
2 years agoavcodec/h264idct_template: Fix integer overflows in ff_h264_idct8_add()
Michael Niedermayer [Mon, 30 Oct 2017 22:21:41 +0000 (23:21 +0100)]
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>
2 years agoavcodec/xan: Improve overlapping check
Michael Niedermayer [Mon, 30 Oct 2017 22:21:40 +0000 (23:21 +0100)]
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>
2 years agoMerge commit '908f737d6c2900b5d34319ca6ea1d1cb71221463'
James Almer [Wed, 1 Nov 2017 21:01:32 +0000 (18:01 -0300)]
Merge commit '908f737d6c2900b5d34319ca6ea1d1cb71221463'

* commit '908f737d6c2900b5d34319ca6ea1d1cb71221463':
  cmdutils: Mark conditionally used variable as av_unused

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f960fd2fb1218d49866d0bf47cbf839233fb9904'
James Almer [Wed, 1 Nov 2017 20:38:30 +0000 (17:38 -0300)]
Merge commit 'f960fd2fb1218d49866d0bf47cbf839233fb9904'

* commit 'f960fd2fb1218d49866d0bf47cbf839233fb9904':
  build: Skip generating .version files when reconfiguring

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'a876958d0fdd8bf10d315175daff12cd7d768053'
James Almer [Wed, 1 Nov 2017 20:37:48 +0000 (17:37 -0300)]
Merge commit 'a876958d0fdd8bf10d315175daff12cd7d768053'

* commit 'a876958d0fdd8bf10d315175daff12cd7d768053':
  avutil/md5: fix misaligned reads

This commit is a noop, see e2b7ae4b198c1dc001b3b28476608eaf4daf726c

Merged-by: James Almer <jamrial@gmail.com>
2 years agoffmpeg: Fix flush packet stream copy input timestamp handling
Mark Thompson [Wed, 1 Nov 2017 00:48:56 +0000 (00:48 +0000)]
ffmpeg: Fix flush packet stream copy input timestamp handling

Since a7da13474286774cf378c3ea606c19a7c1a0eba3, flush packets are passed
to process_input_packet() during stream copy.  This modifies the input
timestamp handling to ignore them - since they contain no data, timestamps
should not be affected.

2 years agoMerge commit '61cec5adaacb358783c18aa07362f15824c1b274'
James Almer [Wed, 1 Nov 2017 19:26:36 +0000 (16:26 -0300)]
Merge commit '61cec5adaacb358783c18aa07362f15824c1b274'

* commit '61cec5adaacb358783c18aa07362f15824c1b274':
  tls: Hide backend implementation details from users

Also includes ed434be106a4615e0419b3ac7664220741afda2d
Changes were made to support schannel and securetransport.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '5edded9df31bc4712a023f89941b4c278f1bd6f5'
James Almer [Wed, 1 Nov 2017 17:13:04 +0000 (14:13 -0300)]
Merge commit '5edded9df31bc4712a023f89941b4c278f1bd6f5'

* commit '5edded9df31bc4712a023f89941b4c278f1bd6f5':
  smacker: Improve error handling

See c1947015b2eec65c7fbd702e1d8c22248be511e8

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'b98f082d8ddc0a0d8317114d8414ab51de60ef02'
James Almer [Wed, 1 Nov 2017 17:07:48 +0000 (14:07 -0300)]
Merge commit 'b98f082d8ddc0a0d8317114d8414ab51de60ef02'

* commit 'b98f082d8ddc0a0d8317114d8414ab51de60ef02':
  smacker: Check that the data size is a multiple of a sample vector

See 4a9af07a49295e014b059c1ab624c40345af5892

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '2ca759657bcda328acc312e5882a940333a3e268'
James Almer [Wed, 1 Nov 2017 17:01:54 +0000 (14:01 -0300)]
Merge commit '2ca759657bcda328acc312e5882a940333a3e268'

* commit '2ca759657bcda328acc312e5882a940333a3e268':
  os_support: Remove the dynamic loading of getaddrinfo from the fallback getaddrinfo

Merged-by: James Almer <jamrial@gmail.com>
2 years agodoc/libav-merge: mention skipped hlsenc commit
James Almer [Wed, 1 Nov 2017 16:55:29 +0000 (13:55 -0300)]
doc/libav-merge: mention skipped hlsenc commit

Signed-off-by: James Almer <jamrial@gmail.com>