summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '6a93b596c5c3af31b843d63013a7985ffeea354d'James Almer2017-04-13
|\ | | | | | | | | | | | | * commit '6a93b596c5c3af31b843d63013a7985ffeea354d': compat/atomics: add typecasts in atomic_compare_exchange_strong() Merged-by: James Almer <jamrial@gmail.com>
| * compat/atomics: add typecasts in atomic_compare_exchange_strong()Wan-Teh Chang2016-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Solaris and Windows emulations of atomic_compare_exchange_strong() need typecasts to avoid compiler warnings, because the functions they call expect a void* pointer but an intptr_t integer is passed. Note that the emulations of atomic_compare_exchange_strong() (except the gcc version) only work for atomic_intptr_t because of the type of the second argument (|expected|). See http://en.cppreference.com/w/c/atomic: _Bool atomic_compare_exchange_strong( volatile A* obj, C* expected, C desired ); The types of the first argument and second argument are different (|A| and |C|, respectively). |C| is the non-atomic type corresponding to |A|. In the emulations of atomic_compare_exchange_strong(), |C| is intptr_t. This implies |A| can only be sig_intptr_t. Signed-off-by: Wan-Teh Chang <wtc@google.com>
* | Merge commit '2170017a1cd033b6f28e16476921022712a522d8'James Almer2017-04-13
|\| | | | | | | | | | | | | | | | | * commit '2170017a1cd033b6f28e16476921022712a522d8': avutil: fix data race in av_get_cpu_flags() This commit is a noop, see fed50c4304eecb352e29ce789cdb96ea84d6162f Merged-by: James Almer <jamrial@gmail.com>
| * avutil: fix data race in av_get_cpu_flags()Wan-Teh Chang2016-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the one-time initialization in av_get_cpu_flags() thread-safe. The static variables |flags|, |cpuflags_mask|, and |checked| in libavutil/cpu.c are 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. Remove the |checked| variable because the invalid value of -1 for |flags| can be used to indicate the same condition. Rename |flags| to |cpu_flags| and move it to file scope. 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>
* | Merge commit 'd5759701a82926059ae3e2530805e900041a5419'James Almer2017-04-13
|\| | | | | | | | | | | | | * commit 'd5759701a82926059ae3e2530805e900041a5419': libkvazaar: Add missing header #includes Merged-by: James Almer <jamrial@gmail.com>
| * libkvazaar: Add missing header #includesDiego Biurrun2016-12-08
| | | | | | | | This fixes compilation after the next version bump.
* | Merge commit '892acc70105df9e6f7773bdde85b3e9541098525'James Almer2017-04-13
|\| | | | | | | | | | | | | | | | | * commit '892acc70105df9e6f7773bdde85b3e9541098525': configure: Fail if cuda was enabled and is not available This commit is a noop. Our CUDA implementation is autodectected. Merged-by: James Almer <jamrial@gmail.com>
| * configure: Fail if cuda was enabled and is not availableDiego Biurrun2016-12-08
| | | | | | | | This is the standard behavior for external libraries.
* | configure: add missing golomb dependency to hevcparseJames Almer2017-04-13
| | | | | | | | Based on a dependency addition from fbec58daa2351cbe9fc758d8735c23ff03313db4
* | Merge commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a'James Almer2017-04-13
|\| | | | | | | | | | | | | * commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a': build: Drop stray golomb dependencies Merged-by: James Almer <jamrial@gmail.com>
| * build: Drop stray golomb dependenciesDiego Biurrun2016-12-08
| |
* | Merge commit 'fbec58daa2351cbe9fc758d8735c23ff03313db4'James Almer2017-04-13
|\| | | | | | | | | | | | | | | | | * commit 'fbec58daa2351cbe9fc758d8735c23ff03313db4': build: Add an internal component for hevc_ps code This commit is a noop, see 498e9e8e2a67e022c189f44fa33350b4f4a7979b Merged-by: James Almer <jamrial@gmail.com>
| * build: Add an internal component for hevc_ps codeDiego Biurrun2016-12-08
| | | | | | | | This allows expressing dependencies in a more correct way.
* | Merge commit 'f912fd767e55bbb5a1554bd99bacab007659609c'James Almer2017-04-13
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f912fd767e55bbb5a1554bd99bacab007659609c': Add missing #includes for standalone spherical-information-related headers fate: Add spherical and stereo3d mov tests avprobe: Allow specifying multiple stream entries to be shown This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * Add missing #includes for standalone spherical-information-related headersDiego Biurrun2016-12-08
| |
| * fate: Add spherical and stereo3d mov testsVittorio Giovara2016-12-07
| |
| * avprobe: Allow specifying multiple stream entries to be shownVittorio Giovara2016-12-07
| |
* | Merge commit 'e90137c045721a1635cc241eb1e1be1126389c38'James Almer2017-04-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e90137c045721a1635cc241eb1e1be1126389c38': mov: Export spherical information lavc: Add spherical packet side data API lavu: Add AVSphericalMapping type and frame side data This commit is a noop, see 8f58ecc344a92e63193c38e28c173be987954bbb e7a6f8c972a0b5b98ef7bbf393e95c434e9e2539 4dcdecf4719a9893f3825ebbad80b2af5aa23613 Merged-by: James Almer <jamrial@gmail.com>
| * mov: Export spherical informationVittorio Giovara2016-12-07
| | | | | | | | | | | | | | This implements Spherical Video V1 and V2, as described in the spatial-media collection by Google. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * lavc: Add spherical packet side data APIVittorio Giovara2016-12-07
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * lavu: Add AVSphericalMapping type and frame side dataVittorio Giovara2016-12-07
| | | | | | | | | | | | | | | | While no decoder currently exports spherical information, this type represents a frame property that has to be passed through from container to frames. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8'James Almer2017-04-13
|\| | | | | | | | | | | | | * commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8': lavu: Add a video section to Doxygen documentation Merged-by: James Almer <jamrial@gmail.com>
| * lavu: Add a video section to Doxygen documentationVittorio Giovara2016-12-07
| | | | | | | | | | | | | | Fill it with AVStereo3D and AVDisplayMatrix documentation. Apply the necessary changes to make verbatim code look good in doxygen. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb'James Almer2017-04-13
|\| | | | | | | | | | | | | * commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb': build: Add missing Makefile entries and ifdefs for QSV hwaccels Merged-by: James Almer <jamrial@gmail.com>
| * build: Add missing Makefile entries and ifdefs for QSV hwaccelsDiego Biurrun2016-12-07
| |
* | Merge commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b'James Almer2017-04-13
|\| | | | | | | | | | | | | * commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b': build: Ensure that the "all" target appears before all Makefile includes Merged-by: James Almer <jamrial@gmail.com>
| * build: Ensure that the "all" target appears before all Makefile includesDiego Biurrun2016-12-07
| | | | | | | | Otherwise builds without explicit target result in silent no-ops.
* | Merge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'James Almer2017-04-13
|\| | | | | | | | | | | | | * commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a': build: Have old H.264/HEVC nvenc encoders select their new counterparts Merged-by: James Almer <jamrial@gmail.com>
| * build: Have old H.264/HEVC nvenc encoders select their new counterpartsDiego Biurrun2016-12-07
| | | | | | | | This makes sense and takes care of missing build dependencies.
* | Merge commit '3e105d08848162b90d886bde59c010d4b0362a4b'James Almer2017-04-13
|\| | | | | | | | | | | | | * commit '3e105d08848162b90d886bde59c010d4b0362a4b': build: Move entries related to building TOOLS to a subdirectory Makefile Merged-by: James Almer <jamrial@gmail.com>
| * build: Move entries related to building TOOLS to a subdirectory MakefileDiego Biurrun2016-12-07
| |
* | Merge commit '4104cc56225f29ce1cded8b2876f8748460232a6'James Almer2017-04-13
|\| | | | | | | | | | | | | * commit '4104cc56225f29ce1cded8b2876f8748460232a6': build: Warn that reconfiguration is necessary if version.h files changed Merged-by: James Almer <jamrial@gmail.com>
| * build: Warn that reconfiguration is necessary if version.h files changedDiego Biurrun2016-12-07
| | | | | | | | | | The library versions are stored in the config.mak file and are used to derive shared library names.
* | Merge commit 'f22da2cdf90dc892d483e2d4003cffc0500816f6'James Almer2017-04-13
|\| | | | | | | | | | | | | | | | | * commit 'f22da2cdf90dc892d483e2d4003cffc0500816f6': configure: add -fPIE instead of -pie to C flags for ThreadSanitizer This commit is a noop, see 3f55752cd566c68ff3d3ae984a3936c1d08ef8ca Merged-by: James Almer <jamrial@gmail.com>
| * configure: add -fPIE instead of -pie to C flags for ThreadSanitizerWan-Teh Chang2016-12-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -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.A8SsaoCF.o /tmp/ffconf.JdpujQlD.c clang: warning: argument unused during compilation: '-pie' clang -fsanitize=thread -pie -Wl,--as-needed -o /tmp/ffconf.2iYA4bsw /tmp/ffconf.A8SsaoCF.o -lm -lm -lbz2 -lz -pthread /usr/bin/ld: /tmp/ffconf.A8SsaoCF.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: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e'James Almer2017-04-13
|\| | | | | | | | | | | | | * commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e': configure: Pass CFLAGS_HEADERS through the right CFLAGS filter Merged-by: James Almer <jamrial@gmail.com>
| * configure: Pass CFLAGS_HEADERS through the right CFLAGS filterDiego Biurrun2016-12-06
| | | | | | | | | | The generic parameter names used for CFLAGS in configure must be filtered for each compiler and replaced by the equivalent flag for that compiler.
* | Merge commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'Hendrik Leppkes2017-04-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca': build: Separate avisynth and avxsynth support Mostly noop, since it could break linux configure with --enable-avisynth, and the configure code which was simplified isn't even present in ffmpeg. Only merged the cosmetic re-ordering in the Makefile. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * build: Separate avisynth and avxsynth supportDiego Biurrun2016-12-06
| | | | | | | | This simplifies the code.
* | tests: Fix gray10 and gray12 references after c1616b45.Carl Eugen Hoyos2017-04-13
| |
* | avcodec/aacenc_ltp: fix use of uninitialized valuesJames Almer2017-04-12
| | | | | | | | | | | | | | Fixes some valgrind warnings. Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat/movenc: Fix potential leak of sgpd_entries array.Matthew Gregan2017-04-12
| | | | | | | | | | Signed-off-by: Matthew Gregan <kinetik@flim.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16.Carl Eugen Hoyos2017-04-12
| |
* | lavf/isom: Remove codec point for WMAv2 that has never worked.Carl Eugen Hoyos2017-04-12
| |
* | configure: Fix decklink license dependency.Carl Eugen Hoyos2017-04-12
| |
* | ffprobe: only use custom logging callback if -show_log is setMarton Balint2017-04-12
| | | | | | | | | | | | | | | | | | The custom callback can cause significant CPU usage on Windows for some large files with many index entries for some reason. v2: Move check after parsing options. Signed-off-by: Marton Balint <cus@passwd.hu>
* | tests/fate/filter-video: fix framerate filter testsMarton Balint2017-04-12
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | avfilter/vf_framerate: always request input if no output is provided in ↵Marton Balint2017-04-12
| | | | | | | | | | | | | | | | request_frame Fixes ticket #6285. Signed-off-by: Marton Balint <cus@passwd.hu>
* | x86/float_dsp: add ff_vector_fmul_reverse_avx2James Almer2017-04-11
| | | | | | | | | | | | ~20% faster than AVX. Signed-off-by: James Almer <jamrial@gmail.com>
* | doc/APIchanges: Fill in missing fieldsMichael Niedermayer2017-04-12
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>