summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg: Ignore SIGPIPEMark Thompson2018-01-251-0/+3
| | | | | | | | | | | | | On systems which deliver SIGPIPE (Unices), a broken pipe will currently result in the immediate termination of the ffmpeg process (the default disposition as required by POSIX). This is undesirable, because while the broken pipe is likely fatal to useful cleanup of whatever component is writing to it, there might be other components which can do useful cleanup - for example, a muxer on another stream may still need to write indexes to complete a file. Therefore, set the signal disposition for SIGPIPE to ignore the signal - the call which caused the signal will fail with EPIPE and the error will be propagated upwards like any other I/O failure on a single stream.
* Merge commit '559370f2c45110afd8308eec7194437736c323d4'Mark Thompson2018-01-251-1/+5
|\ | | | | | | | | | | | | * commit '559370f2c45110afd8308eec7194437736c323d4': qsv: Skip the packet if decoding failure Merged-by: Mark Thompson <[email protected]>
| * qsv: Skip the packet if decoding failureRuiling, Song2018-01-251-1/+5
| | | | | | | | | | | | | | | | | | MediaSDK may fail to decode some frame, just skip it. Otherwise, it will keep decoding the failure packet repeatedly without processing any packet afterwards. Signed-off-by: Ruiling Song <[email protected]> Signed-off-by: Luca Barbato <[email protected]>
* | Merge commit 'a2a9e4eea0e4fde2ed8d3405b4f33f655b600c2d'Mark Thompson2018-01-250-0/+0
|\| | | | | | | | | | | | | | | | | * commit 'a2a9e4eea0e4fde2ed8d3405b4f33f655b600c2d': rtmp: Plug leak if sending bytes read report fails. This commit is a noop, see ee88f31d34c848fd95daf12bdf054b7228efdf14 Merged-by: Mark Thompson <[email protected]>
| * rtmp: Plug leak if sending bytes read report fails.Josh Allmann2018-01-241-1/+3
| | | | | | | | Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '85e10c0a9321bfe0d2afe0f3983ab6a8df6e3fba'Mark Thompson2018-01-251-1/+1
|\| | | | | | | | | | | | | * commit '85e10c0a9321bfe0d2afe0f3983ab6a8df6e3fba': intreadwrite: Use __unaligned in MSVC for ARM64 as well Merged-by: Mark Thompson <[email protected]>
| * intreadwrite: Use __unaligned in MSVC for ARM64 as wellMartin Storsjö2018-01-161-1/+1
| | | | | | | | | | | | | | This attribute is supported for this architecture in MSVC as well (but produces errors if used for 32 bit x86). Signed-off-by: Martin Storsjö <[email protected]>
* | libavformat/rtmpproto: Plug leak if sending bytes read report fails.Josh Allmann2018-01-251-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavfi/vf_xxx_vaapi: fix typo.Jun Zhao2018-01-244-5/+5
| | | | | | | | Signed-off-by: Jun Zhao <[email protected]>
* | avformat/hlsenc: closed caption tags in the master playlistVishwanath Dixit2018-01-245-5/+196
| |
* | avformat: add option to parse/store ID3 PRIV tags in metadata.Richard Shaffer2018-01-245-1/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables getting access to ID3 PRIV tags from the command-line or metadata API when demuxing. The PRIV owner is stored as the metadata key prepended with "id3v2_priv.", and the data is stored as the metadata value. As PRIV tags may contain arbitrary data, non-printable characters, including NULL bytes, are escaped as \xXX. Similarly, any metadata tags that begin with "id3v2_priv." are inserted as ID3 PRIV tags into the output (assuming the format supports ID3). \xXX sequences in the value are un-escaped to their byte value. Signed-off-by: wm4 <[email protected]>
* | avfilter/Makefile: skip compiling vaapi_vpp.h when vaapi is not enabledJames Almer2018-01-231-0/+1
| | | | | | | | | | | | Fixes make checkheaders Signed-off-by: James Almer <[email protected]>
* | configure: fix vaapi_encode_example dependenciesJames Almer2018-01-231-1/+1
| | | | | | | | Signed-off-by: James Almer <[email protected]>
* | MAINTAINERS: Add dashenc maintainerKarthick Jeyapal2018-01-241-0/+1
| | | | | | | | | | | | | | | | If somebody else wants to maintain dashenc either now or in future, I am absolutely fine with giving up this responsibility anytime. But till then we need a maintainer for dashenc, and I am volunteering for that task. Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/dxtory: Fix bits left checksMichael Niedermayer2018-01-231-5/+5
| | | | | | | | | | | | | | | | Fixes: Timeout Fixes: 4863/clusterfuzz-testcase-6347354178322432 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/hevc_cabac: Move prefix check in coeff_abs_level_remaining_decode() downMichael Niedermayer2018-01-231-4/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avutil/aes_ctr: Add method to set 16-byte IV.Jacob Trimble2018-01-234-2/+16
| | | | | | | | | | Signed-off-by: Jacob Trimble <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec: v4l2_context: remove unnecessary codeJorge Ramirez-Ortiz2018-01-231-3/+1
| | | | | | | | | | | | Fixes CID 1418358 Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
* | v4l2_m2m: Fix integer overflow in timestamp handlingMark Thompson2018-01-221-1/+2
| |
* | avcodec/mpeg12dec: fix preprocessor check for mpeg1_nvdec hwaccelJames Almer2018-01-211-1/+1
| | | | | | | | Signed-off-by: James Almer <[email protected]>
* | v4l2_m2m: Fix free of the wrong pointer in an error pathMark Thompson2018-01-211-1/+1
| | | | | | | | Fixes CIDs #1427821 and #1427822.
* | lavfi: add denoise and sharpness VAAPI video filters.Jun Zhao2018-01-215-1/+300
| | | | | | | | | | | | | | | | | | Most code between them is common, so put them in a new file for miscellaneous VAAPI filters. Signed-off-by: Yun Zhou <[email protected]> Signed-off-by: Jun Zhao <[email protected]> Signed-off-by: Mark Thompson <[email protected]>
* | lavfi: add ProcAmp (color balance) VAAPI video filter.Jun Zhao2018-01-215-0/+285
| | | | | | | | | | | | | | | | | | | | Add ProcAmp(color balance) vaapi video filter, use the option like -vf "procamp_vaapi=b=10:h=120:c=2.8:s=3.7" to set brightness/hue/contrast/saturation. Signed-off-by: Yun Zhou <[email protected]> Signed-off-by: Jun Zhao <[email protected]> Signed-off-by: Mark Thompson <[email protected]>
* | lavfi: use common VAAPI VPP infrastructure for vf_deinterlace_vaapi.Jun Zhao2018-01-212-307/+46
| | | | | | | | | | Signed-off-by: Jun Zhao <[email protected]> Signed-off-by: Mark Thompson <[email protected]>
* | lavfi: use common VAAPI VPP infrastructure for vf_scale_vaapi.Jun Zhao2018-01-212-316/+42
| | | | | | | | | | Signed-off-by: Jun Zhao <[email protected]> Signed-off-by: Mark Thompson <[email protected]>
* | lavfi: VAAPI VPP common infrastructure.Jun Zhao2018-01-212-0/+461
| | | | | | | | | | | | | | | | Re-work the VAAPI common infrastructure to avoid code duplication between filters. Signed-off-by: Jun Zhao <[email protected]> Signed-off-by: Mark Thompson <[email protected]>
* | avcodec/truemotion2: Fix integer overflow in TM2_RECALC_BLOCK()Michael Niedermayer2018-01-211-2/+2
| | | | | | | | | | | | | | | | Fixes: signed integer overflow: 1477974040 - -1877995504 cannot be represented in type 'int' Fixes: 4861/clusterfuzz-testcase-minimized-4570316383715328 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]>
* | MAINTAINERS: add myself for avcodec/v4l2_Jorge Ramirez-Ortiz2018-01-211-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | lavc/svq3: Do not write into memory defined as const.Carl Eugen Hoyos2018-01-211-4/+4
| | | | | | | | | | Fixes a warning on ppc: libavcodec/svq3.c:1055:21: warning: passing argument 1 of ‘av_write_bswap32’ discards 'const' qualifier from pointer target type
* | libavformat/dashdec: Fix for ticket 6856 (filename limited to 1024)Colin NG2018-01-211-31/+63
| |
* | libavformat/dashdec: Fix for ticket 6658 (Dash demuxer segfault)Colin NG2018-01-211-13/+115
| | | | | | | | | | | | | | | | | | 1 Add function 'resolve_content_path' to propagate the baseURL from upper level nodes. * if no baseURL is available, the path of mpd file will be set as the baseURL. 2 Remove checking for newly established connection. 3 Establish the communication protocol in each connection rather than applying one protocol to all connection.
* | avformat/dashdec.c: Download dash content with byte range infoColin NG2018-01-211-6/+30
| |
* | dashdec: Only free url string if being reusedBrendan McGrath2018-01-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | If no representation bandwidth value is set, the url value returned by get_content_url is corrupt (as it has been freed). This change ensures the url string is not freed unless it is about to be reused Changes since v1: 1 removed the unneeded 'if' statement (as pointed out by Michael Niedermayer 2 added comment to make it clear why the av_free was required Signed-off-by: Brendan McGrath <[email protected]>
* | avformat/hlsenc: Check that data is setBrendan McGrath2018-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If codecpar->extradata is not set (for example, when the stream goes through the 'tee' muxer), then a segfault occurs. This patch ensures the data variable is not null before attempting to access it Before the var_stream_map option was available - I was using the tee muxer to create each resolution as an individual stream. When running this configuration after the most recent hlsenc change I hit a segfault The most simple command which recreates the segfault is: ffmpeg -i in.ts -map 0:a -map 0:v -c:a aac -c:v h264 -f tee [select=\'a,v\':f=hls]tv_hls_hd.m3u8 Signed-off-by: Brendan McGrath <[email protected]>
* | dashdec: Make use of frame rate specified in Representationsfan52018-01-211-1/+19
| | | | | | | | | | If the manifest provides this, setting r_frame_rate avoids warnings regarding frame rate estimation.
* | avcodec/hevc_parser: use ff_hevc_uninit_parameter_sets()James Almer2018-01-211-10/+1
| | | | | | | | | | Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: James Almer <[email protected]>
* | avcodec/hevcdec: use ff_hevc_uninit_parameter_sets()James Almer2018-01-211-9/+1
| | | | | | | | | | Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: James Almer <[email protected]>
* | avcodec/hevc_ps: add a function to uninitialize parameter set buffersJames Almer2018-01-212-0/+18
| | | | | | | | | | Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: James Almer <[email protected]>
* | lavf/rawdec: Also probe the last byte of mjpeg streams.Carl Eugen Hoyos2018-01-211-1/+1
| | | | | | | | Fixes ticket #6957.
* | avcodec: v4l2_m2m: context: fix raising warning on POLLERRJorge Ramirez-Ortiz2018-01-211-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | During the initialization stage, the codec attempts to get free buffers from the driver before any have been queued (this is to keep the code simple and generic) When the kernel driver detects this situation, it returns POLLERR in revents and ffmpeg therefore raises a warning. This commit disables the warning since no buffers were queued to the driver yet. Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
* | avcodec: v4l2_m2m: remove unnecessary timeout.Jorge Ramirez-Ortiz2018-01-212-27/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Qualcomm's db410c/db820 Venus driver currently present in mainline kernel has a bug which mishandles the CMD_STOP requests causing the decoder to block while draining [1]. This patch removes the workaround that was used to prevent that situation. Encoding/Decoding tested on db820c. [1] on CMD_STOP, the driver is flushing all buffers and never raising IPIPE which ends up in blocking on poll.
* | avcodec: v4l2_m2m: fix races around freeing data on closeMark Thompson2018-01-216-70/+140
| | | | | | | | | | | | | | | | Refcount all of the context information. This also fixes a potential segmentation fault when accessing freed memory (buffer returned after the codec has been closed). Tested-by: Jorge Ramirez-Ortiz <[email protected]>
* | avfilter/drawtext - implement fix_boundsGyan Doshi2018-01-201-1/+27
| | | | | | | | | | | | | | | | | | | | | | When enabled, text, including effects like shadow or box, will be completely bound within the video frame. Default value changed to false to keep continuity of behaviour. Fixes #6960. Signed-off-by: Kyle Swanson <[email protected]>
* | avcodec/snowdec: Fix integer overflow before htaps checkMichael Niedermayer2018-01-201-2/+3
| | | | | | | | | | | | | | | | Fixes: runtime error: signed integer overflow: -1094995529 * 2 cannot be represented in type 'int' Fixes: 4828/clusterfuzz-testcase-minimized-5100849937252352 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]>
* | avcodec/ulti: Check number of blocks at initMichael Niedermayer2018-01-201-0/+2
| | | | | | | | | | | | | | | | Fixes: Timeout Fixes: 4832/clusterfuzz-testcase-4699096590843904 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/lrcdec: Fix memory leak in lrc_read_header()Nikolas Bowe2018-01-201-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | x86inc: Drop cpuflags_slowctzHenrik Gramner2018-01-201-3/+2
| |
* | x86inc: Correctly set mmreg variablesHenrik Gramner2018-01-201-51/+36
| |
* | x86inc: Support creating global symbols from local labelsHenrik Gramner2018-01-201-1/+11
| | | | | | | | | | On ELF platforms such symbols needs to be flagged as functions with the correct visibility to please certain linkers in some scenarios.
* | x86inc: Use .rdata instead of .rodata on WindowsHenrik Gramner2018-01-201-0/+4
| | | | | | | | | | The standard section for read-only data on Windows is .rdata. Nasm will flag non-standard sections as executable by default which isn't ideal.