summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* lavfi: add FFFrameQueue API.Nicolas George2016-12-183-0/+297
|
* avcodec/get_bits: add av_assert2 to get_bits_long()Paul B Mahol2016-12-181-0/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* opus: remove redundant ff_celt_window2 declarationRostislav Pehlivanov2016-12-182-2/+1
| | | | Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* avformat: Auto-detect mjpeg 2000 in mpeg-tsStåle Kristoffersen2016-12-175-1/+58
| | | | | | | This makes it possible to decode motion jpeg 2000 encoded in a transport stream without a correct PMT/PAT. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/tls: add tls url_get_file_handleJay Ridgeway2016-12-174-0/+28
| | | | | | Support url_get_file_handle on TLS streams. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc: Fix ticket 6024, truncated mode decodingPavel Koshevoy2016-12-171-1/+1
| | | | | | | | | | | | | The assumption that avcodec_send_packet makes regarding decoders consuming the entire packet is not true if the codec supports truncated decoding mode and the truncated flag is turned on. Steps to reproduce: ./ffmpeg_g -flags truncated \ -i "http://samples.ffmpeg.org/MPEG2/test-ebu-422.40000.pakets.ts" \ -c:v ffv1 -c:a copy -y /tmp/truncated.nut Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mips: version 1 of vc1dsp optimizations for loongson mmiZhou Xiaoyong2016-12-178-0/+2396
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vf_ssim: add >8 bit depth suppportPaul B Mahol2016-12-171-12/+119
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/wavdec: Eliminate goto for clang -O0 DCEMark Harris2016-12-161-21/+17
| | | | | | | | | | | | | | | | | | Clang is not able to eliminate the reference to ff_spdif_probe() when there is a goto target in the same block and optimization is disabled. This fixes the following build failure on OS X: ./configure --disable-everything --disable-doc \ --enable-decoder=pcm_s16le --enable-demuxer=wav \ --enable-protocol=file --disable-optimizations --cc=clang make ... Undefined symbols for architecture x86_64: "_ff_spdif_probe", referenced from: _set_spdif in libavformat.a(wavdec.o) ld: symbol(s) not found for architecture x86_64 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avutil/imgutils: Clarify doxy for av_image_check_size2()Michael Niedermayer2016-12-161-1/+2
| | | | | Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* fate/psd: add tests for uncompress and rle samplesMartin Vignali2016-12-1613-0/+97
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/h263dec: Return the correct error code in explode modeMichael Niedermayer2016-12-151-1/+1
| | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/smvjpegdec: return the packet size instead of 0Michael Niedermayer2016-12-151-1/+3
| | | | | | | | Most decoders return the amount of data used. This is more consistent Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/tdsc: return the packet size instead of 0Michael Niedermayer2016-12-151-1/+1
| | | | | | | | Most decoders return the amount of data used. This is more consistent Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/screenpresso: return the packet size instead of 0Michael Niedermayer2016-12-151-1/+1
| | | | | | | | Most decoders return the amount of data used. This is more consistent Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/rscc: return the packet size instead of 0Michael Niedermayer2016-12-151-0/+1
| | | | | | | | Most decoders return the amount of data used. This is more consistent Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avfilter/vsrc_testsrc: draw_bar: make sure width is not negativePaul B Mahol2016-12-151-2/+2
| | | | | Reported-by: Josh de Kock Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/mp3dec: fix msan warning when verifying mpa headerChris Cunningham2016-12-151-1/+2
| | | | | | | | MPEG Audio frame header must be 4 bytes. If we fail to read 4 bytes bail early to avoid Use-of-uninitialized-value msan error. Reference https://crbug.com/666874. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* tiff: fix overflows when calling av_reduceAndreas Cadhalpun2016-12-151-2/+11
| | | | | | | The arguments of av_reduce are signed, so the cast to uint64_t is misleading. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* mov: prevent overflow during bit rate calculationAndreas Cadhalpun2016-12-151-1/+14
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* cafdec: prevent overflow during bit rate calculationAndreas Cadhalpun2016-12-151-2/+7
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* 4xm: prevent overflow during bit rate calculationAndreas Cadhalpun2016-12-151-1/+7
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* doc/filters: fix channel names in sofalizer examplePaul B Mahol2016-12-141-2/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avfilter/af_sofalizer: warn if user gives unknown channel namesPaul B Mahol2016-12-141-3/+5
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* doc/filters: drawtext: add example of printing texts on same baselineAndrey Utkin2016-12-141-0/+8
| | | | | | | | | | Height of canvas produced by drawtext varies depending on symbols in text, so add example for printing separate texts aligned horizontally. Wording suggested by Lou Logan <lou@lrcd.com> Signed-off-by: Andrey Utkin <andrey.utkin@pb.com> Signed-off-by: Lou Logan <lou@lrcd.com>
* Add missing #includes for standalone spherical-information-related headersDiego Biurrun2016-12-142-0/+6
| | | | | (cherry picked from commit f912fd767e55bbb5a1554bd99bacab007659609c) Signed-off-by: James Almer <jamrial@gmail.com>
* Bump for psd demuxer and decoderMichael Niedermayer2016-12-142-2/+2
| | | | | Found-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavformat : add Photoshop PSD demuxer.Martin Vignali2016-12-143-0/+34
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavcodec : add decoder for Photoshop PSD image filesMartin Vignali2016-12-147-0/+448
| | | | | | | | Decode the Image Data Section (which contains merged pictures). Support RGB/A and Grayscale/A in 8bits and 16 bits per channel. Support uncompress and rle decompression in Image Data Section. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat: fix overflows during bit rate calculationAndreas Cadhalpun2016-12-1410-11/+11
| | | | | | | | The bit_rate field has type int64_t since commit 7404f3bdb90e6a5dcb59bc0a091e2c5c038e557d. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* swresample/resample: remove swri_resample functionMuhammad Faiz2016-12-141-44/+35
| | | | | | | | | integrate it inside multiple_resample allow some calculations to be performed outside loop Suggested-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* libvpxenc: Don't spam level errors for VP8 encodesAlex Converse2016-12-131-1/+2
| | | | | Fixes "Failed to set VP9E_GET_LEVEL codec control: Codec does not implement requested capability" log messages on VP8 encodes.
* swresample/resample: do not allow negative dst_size return valueMuhammad Faiz2016-12-141-3/+4
| | | | | | | This should fix Ticket6012 Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* avformat/utils: Print verbose error message if stream count exceeds max_streamsMichael Niedermayer2016-12-131-1/+4
| | | | | Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/options_table: Set the default maximum number of streams to 1000Michael Niedermayer2016-12-131-1/+1
| | | | | | | | | Fixes CVE-2016-9561, Note the security relevance of this is disputed as running out of memory can happen with valid files Suggested-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* 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>
OpenPOWER on IntegriCloud