summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d'Clément Bœsch2017-01-31
|\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d': hevc: Separate adding residual to prediction from IDCT This commit should be a noop but isn't because of the following renames: - transform_add → add_residual - transform_skip → dequant - idct_4x4_luma → transform_4x4_luma Merged-by: Clément Bœsch <cboesch@gopro.com>
| * hevc: Separate adding residual to prediction from IDCTAlexandra Hájková2016-07-18
| | | | | | | | | | | | | | | | Based on patch 250430bf28118cf843df887e8c8b345f1c60c82d by Mickaël Raulet <mraulet@insa-rennes.fr>, integrated to Libav by Josh de Kock <josh@itanimul.li>. Signed-off-by: Alexandra Hájková <alexandra@khirnov.net>
* | doc/muxers: add AVI muxer documentationTobias Rapp2017-01-31
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
* | avfilter/overlay: add gbrp output formatPaul B Mahol2017-01-31
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/alac: Export samplerate.Carl Eugen Hoyos2017-01-31
| | | | | | | | Fixes ticket #6096.
* | lavf/xwma: fix incorrect format specifierMoritz Barsnick2017-01-31
| | | | | | | | Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
* | avformat/avienc: add reserve_index_space optionTobias Rapp2017-01-31
| | | | | | | | | | | | | | | | | | | | Allows the user to reserve space for the ODML master index. A sufficient sized master index in the AVI header avoids storing follow-up master indexes within the 'movi' data later. If the option is omitted or zero the index size is estimated from output duration and bitrate. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
* | ircamdec: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-31
| | | | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avutil/frame: fix av_frame_copy for unknown layoutsMarton Balint2017-01-31
| | | | | | | | | | | | | | | | | | I wonder how unknown layouts ever worked without this? Reviewed-by: Nicolas George <george@nsup.org> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avformat/mov: Fix integer truncation in mov_read_uuid()Michael Niedermayer2017-01-30
| | | | | | | | | | | | Fixes Ticket6102 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter: add threshold filterPaul B Mahol2017-01-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/msf: fix codec 4 (joint stereo ATRAC3) and alignbnnm2017-01-30
| | | | | | | | | | | | | | | | | | Codec 4 (frame size 98) uses joint stereo per spec and examples. Also removed an incorrect "align" var which wasn't used anyway (it was overwrittern). Probably all/only .AT3 of frame size 98 are JS, too. Signed-off-by: bnnm <bananaman255@gmail.com>
* | avformat/Makefile: fix compilation of testprogs when networking is disabledTobias Rapp2017-01-30
| | | | | | | | Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
* | doc/libav-merge: add unmerged hevc commits hashesClément Bœsch2017-01-30
| |
* | lavc/hevcdsp: fix pretty printing mistakeClément Bœsch2017-01-30
| | | | | | | | "Issue" introduced in 83976e40e89655162e5394cf8915d9b6d89702d9.
* | avutil/eval: add atan2 functionPaul B Mahol2017-01-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: add SCC muxerPaul B Mahol2017-01-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/sccdec: simplify 2 sscanf callsPaul B Mahol2017-01-30
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | xvag: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-30
| | | | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | epafdec: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-30
| | | | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | genh: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-30
| | | | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avfilter/showcqt: make minimum timeclamp option lowerMuhammad Faiz2017-01-30
| | | | | | | | | | | | high basefreq does not require high timeclamp Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | lavc/mjpegdec: consume SOS data even if the frame is discardedMatthieu Bouron2017-01-29
| | | | | | | | | | Speeds up next marker search when a SOS marker is found but the frame is discarded (which happens in avformat_find_stream_info).
* | lavfi: make ff_framequeue_skip_samples() more useful.Nicolas George2017-01-29
| | | | | | | | | | | | | | | | | | | | Instead of just updating statistics and leaving the work to the call site, have it actually do the work. Also: skip the samples by updating the frame data pointers instead of moving the samples. More efficient and avoid writing into shared frames. Found-By: Muhammad Faiz <mfcc64@gmail.com>
* | doc/examples/decoder_targeted: move to tools/target_dec_fuzzer.cRostislav Pehlivanov2017-01-29
| | | | | | | | | | | | | | | | Name and purpose are more appropriate there since the code isn't an ideal example. Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | doc/examples/decoder_targeted: Disable error concealment after 20 framesMichael Niedermayer2017-01-29
| | | | | | | | | | | | | | | | | | | | | | This allows testing EC and non EC. Avoids spending most time in EC on high res samples and reduces the likelyhood of hitting timeouts Fixes: Timeout in 467/fuzz-2-ffmpeg_VIDEO_AV_CODEC_ID_H263_fuzzer Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/vf_remap: add . at end of long descriptionPaul B Mahol2017-01-29
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | boadec: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-29
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | pvfdec: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-29
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | electronicarts: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-29
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | 4xm: prevent overflow during block alignment calculationAndreas Cadhalpun2017-01-29
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/ac3dec: Fix to prevent runaway ac3 detection by looking at the ↵Marijn Meijles2017-01-28
| | | | | | | | | | | | | | | | | | actual frame rather than the first detected frame. When detecting a swapped AC3 marker the data of the frame is swapped. However, in subsequent frames the data swapped is taken from the first frame rather than the current frame. Signed-off-by: Marijn Meijles <marijn@bitpit.net> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat: Ignore ID3v2 tags if other tags are present e.g. vorbisPaul Arzelier2017-01-28
| | | | | | | | | | Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/matroskaenc: don't reserve more bytes than needed for the Colour ↵James Almer2017-01-28
| | | | | | | | | | | | | | master size Found-by: Aaron Colwell <acolwell@google.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/sccdec: attempt to fix valgrind issuePaul B Mahol2017-01-28
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: fix ID3v2 parser for v2.2 comment framesChris Moeller2017-01-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | mov: Fix spherical metadata_source parsingAaron Colwell2017-01-27
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | avfilter/vf_gblur: Increase supported pixel count from 31bit to 32bit in ↵Michael Niedermayer2017-01-27
| | | | | | | | | | | | | | | | filter_postscale() Fixes CID1396252 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg.c: Add output file index and stream index to vstats file.Sasi Inguva2017-01-27
| | | | | | | | | | Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/matroskaenc.c: Free dyn bufs in mkv_free. Fixes memory leaks when ↵Sasi Inguva2017-01-27
| | | | | | | | | | | | | | muxing fails. Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: add SCC testPaul B Mahol2017-01-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avfilter/avf_showspectrum: fix 2 possible crashesPaul B Mahol2017-01-27
| | | | | | | | | | | | | | Make sure no division by zero is done. Make sure there are actually samples available. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | doc/filters: mention recently added optionPaul B Mahol2017-01-27
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavf/img2dec: Reduce the probe score for incomplete jpgs.Carl Eugen Hoyos2017-01-27
| | | | | | | | Ensures that probing doesn't finish prematurely for small files.
* | avcodec/h264dec: Clear ref_count on slice header processing failureMichael Niedermayer2017-01-27
| | | | | | | | | | | | | | | | | | Fixes using freed memory Introduced in 744801989099df26e90b00062c645969c5347533 Fixes: 471/fuzz-1-ffmpeg_VIDEO_AV_CODEC_ID_H264_fuzzer Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/matroskadec: ProjectionPrivate is optional on Equirectangular ↵James Almer2017-01-26
| | | | | | | | | | | | | | | | projections This reflects a recent change to the spec draft. Signed-off-by: James Almer <jamrial@gmail.com>
* | tcp: set socket buffer sizes before listen/connect/acceptJoel Cunningham2017-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From e24d95c0e06a878d401ee34fd6742fcaddeeb95f Mon Sep 17 00:00:00 2001 From: Joel Cunningham <joel.cunningham@me.com> Date: Mon, 9 Jan 2017 13:37:51 -0600 Subject: [PATCH] tcp: set socket buffer sizes before listen/connect/accept Attempting to set SO_RCVBUF and SO_SNDBUF on TCP sockets after connection establishment is incorrect and some stacks ignore the set call on the socket at this point. This has been observed on MacOS/iOS. Windows 7 has some peculiar behavior where setting SO_RCVBUF after applies only if the buffer is increasing from the default while decreases are ignored. This is possibly how the incorrect usage has gone unnoticed Unix Network Programming Vol. 1: The Sockets Networking API (3rd edition, seciton 7.5): "When setting the size of the TCP socket receive buffer, the ordering of the function calls is important. This is because of TCP's window scale option, which is exchanged with the peer on SYN segments when the connection is established. For a client, this means the SO_RCVBUF socket option must be set before calling connect. For a server, this means the socket option must be set for the listening socket before calling listen. Setting this option for the connected socket will have no effect whatsoever on the possible window scale option because accept does not return with the connected socket until TCP's three-way handshake is complete. This is why the option must be set on the listening socket. (The sizes of the socket buffers are always inherited from the listening socket by the newly created connected socket)" Signed-off-by: Joel Cunningham <joel.cunningham@me.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter: add abitscope multimedia filterPaul B Mahol2017-01-26
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/flacdec: Check avio_read result when reading flac block header.Frank Liberato2017-01-25
| | | | | | | | | | | | Return AVERROR_INVALIDDATA if all four bytes aren't present. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg_opt.c: Introduce a -vstats_version option and document the existing ↵Sasi Inguva2017-01-25
| | | | | | | | | | | | | | -vstats format. Signed-off-by: Sasi Inguva <isasi@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>