James Almer
88d6f79ac0
Merge commit '857e26b655a769e5a56bada1a0d9adb44cc176b7'
...
* commit '857e26b655a769e5a56bada1a0d9adb44cc176b7':
build: Add an option for passing linker flags to the shared library build
See e34a3468f2 .
--extra-ldlibflags is left in place for compatibility reasons.
Merged-by: James Almer <jamrial@gmail.com >
2017-11-06 17:57:53 -03:00
James Almer
7a5a1c8c97
Merge commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c'
...
* commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c':
configure: Automatically add -isysroot for darwin if --sysroot is specified
Merged-by: James Almer <jamrial@gmail.com >
2017-11-06 17:50:00 -03:00
James Almer
163e3bd097
Merge commit 'f519e131c101ae3948dabf1f7f598efbff5fb536'
...
* commit 'f519e131c101ae3948dabf1f7f598efbff5fb536':
af_bs2b: Add missing casts to complex pointer assignments
Merged-by: James Almer <jamrial@gmail.com >
2017-11-06 17:45:31 -03:00
Paul B Mahol
a29a0aba79
avformat/ty: do not overread chunk
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2017-11-06 21:00:08 +01:00
Paul B Mahol
cdd19e2c56
avformat/ty: try harder to find stream signature
...
Search all chunks, not just first one.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2017-11-06 20:50:16 +01:00
James Almer
f7c01ff24d
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 >
2017-11-06 16:25:32 -03:00
Paul B Mahol
a6a6935ee8
avformat: add TiVo ty demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2017-11-06 18:20:29 +01:00
Ashish Pratap Singh
7b7037e5b0
avfilter:vf_libvmaf: improve docs.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2017-11-06 07:50:34 -05:00
Ashish Pratap Singh
4c38aa79ec
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 >
2017-11-06 07:50:11 -05:00
Carl Eugen Hoyos
0a60cc909e
lavf/amr: Do not set codec_tag for raw amr_nb and raw amr_wb.
2017-11-06 13:36:40 +01:00
Marton Balint
d68a557df4
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 >
2017-11-06 00:00:38 +01:00
Martin Vignali
cb618da8d3
Maintainers : add myself for exr
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-11-05 22:13:12 +01:00
Michael Niedermayer
981e99ab99
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 >
2017-11-05 22:13:16 +01:00
Michael Niedermayer
7d1dec4668
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 >
2017-11-05 22:13:16 +01:00
Michael Niedermayer
e34fe61bf4
avutil/softfloat: Add FLOAT_MIN
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-11-05 22:13:16 +01:00
Michael Niedermayer
e131b8cedb
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 >
2017-11-05 22:13:16 +01:00
Carl Eugen Hoyos
e06bdc3c37
lavf/amr: Add amrnb and amrwb demuxers.
...
Fixes ticket #6678 .
2017-11-05 20:51:03 +01:00
Carl Eugen Hoyos
2cc51d5025
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
2017-11-05 19:25:29 +01:00
Piotr Bandurski
6ea7711532
avcodec/qdrw: support 16bpp files with bppcnt == 2 && bpp == 8
2017-11-05 10:49:17 +01:00
Paul B Mahol
3f4fccf4d6
avformat/mvdec: check for EOF
...
Fixes #6805 .
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2017-11-05 10:42:07 +01:00
Peter Große
0ae1f6ddeb
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 >
2017-11-05 03:14:29 +01:00
Peter Große
3ddb887c88
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 >
2017-11-05 03:14:29 +01:00
Kaustubh Raste
b9cd26f556
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 >
2017-11-05 03:12:35 +01:00
Kaustubh Raste
1e7e9fbb03
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 >
2017-11-05 03:12:35 +01:00
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