summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* avfilter/avfilter: fix filtering frames with unknown channel layouts for ↵Marton Balint2016-12-131-1/+1
| | | | | | | filters needing writable frames Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* avcodec/mips: version 1 of wmv2dsp optimizations for loongson mmiZhou Xiaoyong2016-12-136-0/+351
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mips: version 1 of vp8dsp optimizations for loongson mmiZhou Xiaoyong2016-12-136-0/+3261
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: add -fPIE instead of -pie to C flags for ThreadSanitizerWan-Teh Chang2016-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | -pie was added to C flags for ThreadSanitizer in commit 19f251a2882a8d0779b432e63bf282e4d9c443bb. Under clang 3.8.0, the -pie flag causes a compiler warning and a linker error when running configure --toolchain=clang-tsan. Here is an excerpt from config.log: clang ... -fsanitize=thread -pie -std=c11 -fomit-frame-pointer -pthread -c -o /tmp/ffconf.hL61stP9.o /tmp/ffconf.YO6ZaSFG.c clang: warning: argument unused during compilation: '-pie' clang -fsanitize=thread -pie -Wl,--as-needed -Wl,-z,noexecstack -o /tmp/ffconf.W5c2e41l /tmp/ffconf.hL61stP9.o -lbz2 -pthread /usr/bin/ld: /tmp/ffconf.hL61stP9.o: relocation R_X86_64_PC32 against undefined symbol `atan2f@@GLIBC_2.2.5' can not be used when making a shared object; recompile with -fPIC /usr/bin/ld: final link failed: Bad value clang: error: linker command failed with exit code 1 (use -v to see invocation) To be conservative, I changed -pie to -fPIE. But the documentation seems to imply just -fsanitize=thread is enough: http://clang.llvm.org/docs/ThreadSanitizer.html https://github.com/google/sanitizers/wiki/ThreadSanitizerCppManual Signed-off-by: Wan-Teh Chang <wtc@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil: fix data race in av_get_cpu_flags()Wan-Teh Chang2016-12-132-7/+7
| | | | | | | | | | | | | | | | | | | | Make the one-time initialization in av_get_cpu_flags() thread-safe. The static variable |cpu_flags| in libavutil/cpu.c is read and written using normal load and store operations. These are considered as data races. The fix is to use atomic load and store operations. The fix can be verified by running the libavutil/tests/cpu_init.c test program under ThreadSanitizer: ./configure --toolchain=clang-tsan make libavutil/tests/cpu_init libavutil/tests/cpu_init There should be no warnings from ThreadSanitizer. Co-author: Dmitry Vyukov of Google, who suggested the data race fix. Signed-off-by: Wan-Teh Chang <wtc@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil/tests/imgutils: Remove unused variableMichael Niedermayer2016-12-131-1/+0
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* opt: reject denominator zero as out of rangeAndreas Cadhalpun2016-12-131-1/+1
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* fate: Add h264 test for frame num gapsDerek Buitenhuis2016-12-122-0/+37
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* avcodec/cuvid: fix compilation with msvc11Timo Rothenpieler2016-12-121-1/+2
|
* lavf/mov: Accept multiple fourcc for AVID 1:1.Carl Eugen Hoyos2016-12-121-0/+2
| | | | Fixes ticket #5982.
* lavf/isom: Support EVRC in pvAuthor files.Carl Eugen Hoyos2016-12-121-0/+1
| | | | Fixes ticket #6014.
* avformat/matroskadec: remove the strict unofficial check for Colour elementsJames Almer2016-12-101-6/+3
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/matroskadec: allocate Colour related fields only if the file ↵James Almer2016-12-101-24/+30
| | | | | | | | | | contains the relevant master The demuxer doesn't fill the defaults if the master isn't present. This results in codecpar->color_space being set with a value of zero (RGB) on such files. Signed-off-by: James Almer <jamrial@gmail.com>
* ffplay: fix sws_scale possible out of bounds array accessMarton Balint2016-12-101-8/+8
| | | | | | | | | | | As I used simple RGBA formats for subtitles and for the video texture if avfilter is disabled I kind of assumed that sws_scale won't access data pointers and strides above index 0, but apparently that is not the case. Fixes Coverity CID 1396737, 1396738, 1396739, 1396740. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* avutil/tests: run the cpu_init.c test conditionally on HAVE_THREADSWan-Teh Chang2016-12-103-9/+2
| | | | | | | Suggested by Diego Biurrun and James Almer. Signed-off-by: Wan-Teh Chang <wtc@google.com> Signed-off-by: James Almer <jamrial@gmail.com>
* avutil/cpu_init: remove unnecessary arguments to the main() functionWan-Teh Chang2016-12-101-1/+1
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec: Add max_pixels optionsMichael Niedermayer2016-12-106-6/+23
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil: Add av_image_check_size2()Michael Niedermayer2016-12-104-6/+42
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* fate: add av_image_check_size() testMichael Niedermayer2016-12-104-0/+97
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* configure: fail if autodetect-libraries are requested but not foundAndreas Cadhalpun2016-12-102-22/+57
| | | | Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* configure: enable autodetected libraries after option parsingAndreas Cadhalpun2016-12-101-9/+9
| | | | | | | | And only enable them, if they haven't been disabled. This is needed for the following patch. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* configure: enable sdl if sdl2 is enabledAndreas Cadhalpun2016-12-101-1/+1
| | | | | | sdl is supposed to be an alias, so it should have the same value. Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* libavcodec/tests: Add avpacket test to .gitignoreDerek Buitenhuis2016-12-101-0/+1
| | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* configure: Require bit_depth field for VAAPI VP9 decode hwaccelMark Thompson2016-12-101-2/+2
| | | | | | | libva versions from 1.6.0 to 1.6.2 do not include it, and therefore cannot work with VP9 profile >= 2. Fixes ticket #6003.
* opus_parser: make ParseContext the first element in OpusParseContextAndreas Cadhalpun2016-12-101-1/+1
| | | | | | | | ff_parse_close expects priv_data to be the ParseContext directly and thus doesn't work if it isn't at the beginning of OpusParseContext. Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* opus_parser: fix leaking channel_maps on errorAndreas Cadhalpun2016-12-102-1/+1
| | | | | | | | Make ff_opus_parse_extradata free allocated memory on error instead of expecting callers to free it in that case. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* avfilter/af_ashowinfo: properly show input channel layout for unknown ↵Marton Balint2016-12-101-1/+1
| | | | | | | channel layouts Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* avfilter/af_channelmap: add support for unknown input channel layoutsMarton Balint2016-12-101-4/+4
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* avfilter/af_atempo: add support for unknown channel layoutsMarton Balint2016-12-101-1/+1
| | | | | Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* avfilter/formats: allow unknown channel layouts by defaultMarton Balint2016-12-109-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the default in the libav fork is to only allow known layouts, making unknown layouts allowed by default here can be a security risk for filters directly merged from libav. However, usually it is simple to detect such cases, use of av_get_channel_layout_nb_channels is a good indicator, so I suggest we change this regardless. See http://ffmpeg.org/pipermail/ffmpeg-devel/2016-November/203204.html. This patch indirectly adds unknown channel layout support for filters where query_formats is not specified: abench afifo ainterleave anullsink apad aperms arealtime aselect asendcmd asetnsamples asetpts asettb ashowinfo azmq It introduces a query_formats callback for the asyncts filter, which only supports known channel layouts since it is using libavresample. And it removes .query_formats callback from filters where it was only there to support unknown layouts, as this is now the default: aloop ametadata anull asidedata asplit atrim Acked-by: Nicolas George <george@nsup.org> Signed-off-by: Marton Balint <cus@passwd.hu>
* avcodec/mpeg12dec: Add FF_CODEC_CAP_SKIP_FRAME_FILL_PARAMMichael Niedermayer2016-12-101-1/+5
| | | | | | | | | | This decreases the amount of computations and memory needed for analysing mpeg1/2 streams the properties update is moved from code that is skiped if skip_frame is set to code that is not skiped so the change doesnt loose that from being executed Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample/resample_template: Add filter values in parallelMichael Niedermayer2016-12-101-4/+12
| | | | | | | | | This is faster 2871 -> 2189 cycles for int16 matrixbench -> 23456hz Fixes a integer overflow in a artificial corner case Fixes part of 668007-media Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample/resample_template: Reorder operations to avoid one additionMichael Niedermayer2016-12-101-6/+9
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* swresample/swresample: Check count before memcpy()Michael Niedermayer2016-12-101-2/+2
| | | | | | | | Fixes undefined operation Fixes part of 668007-media Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mpeg4videodec: Fix undefined shifts in mpeg4_decode_sprite_trajectory()Michael Niedermayer2016-12-091-6/+6
| | | | | | | Fixes: part of 670190.ogg Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/oggdec: Skip streams in duration correction that did not had their ↵Michael Niedermayer2016-12-091-0/+2
| | | | | | | | | | duration set. Fixes: part of 670190.ogg Fixes integer overflow Found-by: Matt Wolenetz <wolenetz@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* h264_slice: Wait for refs to be available before we use them in error ↵Derek Buitenhuis2016-12-091-0/+3
| | | | | | | | | | | | concealment This could happen when there was a frame number gap and frame threading was used. This fixes #5458. Debugging-by: Ronald S. Bultje <rsbultje@gmail.com> Debugging-by: Justin Ruggles <justin.ruggles@gmail.com> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* fate: add a monoscopic spherical matroska testJames Almer2016-12-092-0/+20
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* fate: improve fate-mov dependenciesJames Almer2016-12-091-11/+8
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/ffv1enc: Allocate smaller packet if the worst case size cannot be ↵Michael Niedermayer2016-12-091-0/+5
| | | | | | | | | | | allocated We are checking during encoding if there is enough space as version 4 needs that check. Fixes Ticket6005 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/ffv1enc: Fix size of first sliceMichael Niedermayer2016-12-091-4/+9
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* aacdec: Rename elem_type_prev to che_prev_type.Alex Converse2016-12-081-4/+4
| | | | | It describes the type of the previous che element (SCE, CPE, CCE, or LFE) and does not reflect non-che elements.
* aacdec: Allow SBR after DRC.Alex Converse2016-12-081-2/+4
| | | | | | Fixes https://www2.iis.fraunhofer.de/AAC/7.1auditionOutLeader_v2_rtb.mp4 Reported-by: rcombs on IRC
* doc/muxers: remove "-strict experimental" from tee muxer examplesLou Logan2016-12-081-2/+2
| | | | | | | Examples use the native FFmpeg AAC encoder but it is no longer considered experimental and therefore not required. Signed-off-by: Lou Logan <lou@lrcd.com>
* avfilter/vf_deband: fix silly mistakesPaul B Mahol2016-12-081-4/+4
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat: Add max_streams optionMichael Niedermayer2016-12-085-3/+15
| | | | | | This allows user apps to stop OOM due to excessive number of streams Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* aarch64: h264idct: Use the offset parameter to movrelMartin Storsjö2016-12-081-1/+1
| | | | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st> (cherry picked from commit 6a62795d4051f435a9a2c59395d96913693922f8) Cherry pick Suggested-by: Martin Storsjö This should fix the build failure on macosx Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_hwupload_cuda: Add min/max limits for the 'device' optionSrinath K R2016-12-081-1/+1
| | | | Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
* avformat/matroskadec: remove unused variableJames Almer2016-12-081-1/+1
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avformat/matroskadec: fix memleak on stream side data failureJames Almer2016-12-081-1/+3
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
OpenPOWER on IntegriCloud