Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-04-17Merge commit 'ade370a4d7eab1866b6023c91c135d27c77ca465'Clément Bœsch
* commit 'ade370a4d7eab1866b6023c91c135d27c77ca465': lavfi: Add VAAPI deinterlacer This commit is a noop, see 359586f14f46bf3f9c1ae3375d80e8c0fc377bef Merged-by: Clément Bœsch <u@pkh.me>
2017-04-17Merge commit 'f8a1ead0ae4402df0503c83f213f57b785a5f20f'Clément Bœsch
* commit 'f8a1ead0ae4402df0503c83f213f57b785a5f20f': build: Add -D_XOPEN_SOURCE=600 to CPPFLAGS on Cygwin Merged-by: Clément Bœsch <u@pkh.me>
2017-04-17Merge commit '39fbcf8f76ff2e7cd8d09307e6aacc70ce8f5fed'Clément Bœsch
* commit '39fbcf8f76ff2e7cd8d09307e6aacc70ce8f5fed': configure: Fix _libs vs. _extralibs oversight This commit is a noop, see 9bf3d8408937e101921b3a0090cd6ae116b0c41f Merged-by: Clément Bœsch <u@pkh.me>
2017-04-17Merge commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5'Clément Bœsch
* commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5': build: Use _extralibs variable names instead of _libs everywhere Merged-by: Clément Bœsch <u@pkh.me>
2017-04-17build: remove special freetype checkClément Bœsch
Since 52ccc4a0e was merged, it's pointless to keep our special version.
2017-04-17Merge commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c'Clément Bœsch
* commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c': build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS Merged-by: Clément Bœsch <u@pkh.me>
2017-04-17Merge commit 'a7101eb40e69ada3872ec5aebe9c5c165745fb3a'Clément Bœsch
* commit 'a7101eb40e69ada3872ec5aebe9c5c165745fb3a': configure: Simplify some library checks via check_lib() This commit is a noop as it doesn't apply to FFmpeg: - the nanosleep check doesn't use add_extralibs in FFmpeg - the pthread checks check multiple functions before add the extra libraries Merged-by: Clément Bœsch <u@pkh.me>
2017-04-17Merge commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb'Clément Bœsch
* commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb': build: Fix dependencies for alsa/jack/sndio support Added explicit enable (which will be automatically added later on in ee480790c) to actually fix this commit. Without the explicit enables, alsa, jack and sndio gets disabled. Also added jack, alsa and sndio to the have list so the HAVE_* are populated to make (this fixes the SKIPHEADERS chunks). Merged-by: Clément Bœsch <u@pkh.me>
2017-04-15Merge commit 'af451ac0de6776e97d6a3ff95eac257b7964002e'Clément Bœsch
* commit 'af451ac0de6776e97d6a3ff95eac257b7964002e': configure: Drop redundant and partly bogus vaapi/vdpau header checks Merged-by: Clément Bœsch <u@pkh.me>
2017-04-15Merge commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a'Clément Bœsch
* commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a': vdpau: Do not #include vdpau_x11.h from the main vdpau header Merged-by: Clément Bœsch <u@pkh.me>
2017-04-15avdevice/decklink: remove pthread dependencyAaron Levinson
Purpose: avdevice/decklink: Removed pthread dependency by replacing semaphore used in code appropriately. Doing so makes it easier to build ffmpeg using Visual C++ on Windows. This is a contination of Kyle Schwarz's "avdevice/decklink: Remove pthread dependency" patch that is available at https://patchwork.ffmpeg.org/patch/2654/ . This patch wasn't accepted, and as far as I can tell, there was no follow-up after it was rejected. Notes: Used Visual Studio 2015 (with update 3) for this. Comments: -- configure: Eliminated pthreads dependency for decklink_indev_deps and decklink_outdev_deps and replaced with threads dependency -- libavdevice/decklink_common.cpp / .h: a) Eliminated semaphore and replaced with a combination of a mutex, condition variable, and a counter (frames_buffer_available_spots). b) Removed include of pthread.h and semaphore.h and now using libavutil/thread.h instead. -- libavdevice/decklink_dec.cpp: Eliminated include of pthread.h and semaphore.h. -- libavdevice/decklink_enc.cpp: a) Eliminated include of pthread.h and semaphore.h. b) Replaced use of semaphore with the equivalent using a combination of a mutex, condition variable, and a counter (frames_buffer_available_spots). In theory, libavutil/thread.h and the associated code could have been modified instead to add cross-platform implementations of the sem_ functions, but an inspection of the ffmpeg source base indicates that there are only two cases in which semaphores are used (including this one that was replaced), so it was deemed to not be worth the effort. Signed-off-by: Marton Balint <cus@passwd.hu>
2017-04-15ffplay: fix indentationMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-04-15ffplay: convert to new decode APIMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-04-15avcodec/dnxhdenc: fix recent regressionPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-15lavc/opus_pvq: Add missing copyright notices from libopus.Carl Eugen Hoyos
The file is based on libopus, analyzed by Rostislav Pehlivanov.
2017-04-14avformat/hlsenc: add hls encrypt optionsSteven Liu
refer to: https://git.libav.org/?p=libav.git;a=commitdiff;h=0a4b9d0ccd10b3c39105f99bd320f696f69a75a2 add hls encrypt options looks like libav's libavformat/hlsenc.c Reviewed-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-04-14avcodec/dnxhd*: add ff_dnxhd_get_hr_frame_size()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-14avcodec/dnxhdenc: make sure that mb_height > 255 can be storedPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-14opus_pvq: add resynth support and band encoding cost functionRostislav Pehlivanov
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-14build: fix tools build dependenciesJames Almer
Found-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-14Merge commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360'James Almer
* commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360': dxva2: Adjust multiple inclusion guard names to follow convention This commit is a noop, see 180f9a09588d1c68983692bb5245213956fdde11 Merged-by: James Almer <jamrial@gmail.com>
2017-04-14Merge commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390'James Almer
* commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390': vf_hwupload_cuda: Add min/max limits for device option This commit is a noop, see4df5a6a26a8aa08bbc6d027c2fb44fcf870e98d7 Merged-by: James Almer <jamrial@gmail.com>
2017-04-14Merge commit '4efea4ce75fbea3e5f8be8040068bfaaffbb2718'James Almer
* commit '4efea4ce75fbea3e5f8be8040068bfaaffbb2718': APIChanges: Mention where release 12 was cut This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
2017-04-14Merge commit '3f75e5116b900f1428aa13041fc7d6301bf1988a'James Almer
* commit '3f75e5116b900f1428aa13041fc7d6301bf1988a': avio: Keep track of the amount of data written Merged-by: James Almer <jamrial@gmail.com>
2017-04-14Merge commit 'fc85646ad495f3418042468da415af73a7a07334'James Almer
* commit 'fc85646ad495f3418042468da415af73a7a07334': libopusdec: fix out-of-bounds read libschroedingerdec: fix leaking of framewithpts libschroedingerdec: don't produce empty frames This commit is a noop, see a86ebbf7f641bc797002ddea7fb517759722cd1b 3c0328d58d98664b05efdd377d3fe66a569d385e 8c8f543b81aa2b50bb6a6cfd370a0061281492a3 Merged-by: James Almer <jamrial@gmail.com>
2017-04-14Support building C++ files with MSVCAaron Levinson
Made appropriate changes to be able to successfully build C++ files using a Visual C++ build on Windows. Based on an earlier patch by Kyle Schwarz. Comments: -- compat/w32pthreads.h: Made appropriate changes to w32pthreads.h to get it to build when it is being included in a C++ file and built with Visual C++. This is mostly a copy of Kyle Schwarz's patch as described above. -- configure: a) Now calling set_ccvars CXX to cause the various CXX_ variables to be setup properly. For example, with MSVC (Microsoft Visual C++), this causes CXX_O to be set to -Fo$@ instead of using the default value. The default value does not work with Visual C++. This change will also have the impact of correcting CXX_O (and possibly CXX_C) for other compilers, although this is really only relevant for the Intel compiler, in addition to MSVC. b) Now using cl for the C++ compiler for the MSVC toolchain. This is currently only relevant for building the Blackmagic/Decklink-related files under avdevice. Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
2017-04-14Merge commit 'd3da8a0035734529c4e26696c9a0c6cb56633838'James Almer
* commit 'd3da8a0035734529c4e26696c9a0c6cb56633838': omx: Fix allocation check This commit is a noop, see 16a75304fe42d3a007c78126b6370c94ccf891f6 Merged-by: James Almer <jamrial@gmail.com>
2017-04-14Merge commit 'd32bdadda86b35c2960e4de877cf081b9d2dadb3'James Almer
* commit 'd32bdadda86b35c2960e4de877cf081b9d2dadb3': qsvdec: Fix memory leak on error This commit is a noop, see b6f80b16d1a82463a77352b8756e1cdcaa3a33d0 Merged-by: James Almer <jamrial@gmail.com>
2017-04-14Merge commit '6a93b596c5c3af31b843d63013a7985ffeea354d'James Almer
* commit '6a93b596c5c3af31b843d63013a7985ffeea354d': compat/atomics: add typecasts in atomic_compare_exchange_strong() Merged-by: James Almer <jamrial@gmail.com>
2017-04-14Merge commit '2170017a1cd033b6f28e16476921022712a522d8'James Almer
* 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>
2017-04-14Merge commit 'd5759701a82926059ae3e2530805e900041a5419'James Almer
* commit 'd5759701a82926059ae3e2530805e900041a5419': libkvazaar: Add missing header #includes Merged-by: James Almer <jamrial@gmail.com>
2017-04-14Merge commit '892acc70105df9e6f7773bdde85b3e9541098525'James Almer
* 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>
2017-04-14configure: add missing golomb dependency to hevcparseJames Almer
Based on a dependency addition from fbec58daa2351cbe9fc758d8735c23ff03313db4
2017-04-14Merge commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a'James Almer
* commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a': build: Drop stray golomb dependencies Merged-by: James Almer <jamrial@gmail.com>
2017-04-13Merge commit 'fbec58daa2351cbe9fc758d8735c23ff03313db4'James Almer
* 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>
2017-04-13Merge commit 'f912fd767e55bbb5a1554bd99bacab007659609c'James Almer
* 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>
2017-04-13Merge commit 'e90137c045721a1635cc241eb1e1be1126389c38'James Almer
* 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>
2017-04-13Merge commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8'James Almer
* commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8': lavu: Add a video section to Doxygen documentation Merged-by: James Almer <jamrial@gmail.com>
2017-04-13Merge commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb'James Almer
* commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb': build: Add missing Makefile entries and ifdefs for QSV hwaccels Merged-by: James Almer <jamrial@gmail.com>
2017-04-13Merge commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b'James Almer
* commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b': build: Ensure that the "all" target appears before all Makefile includes Merged-by: James Almer <jamrial@gmail.com>
2017-04-13Merge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'James Almer
* commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a': build: Have old H.264/HEVC nvenc encoders select their new counterparts Merged-by: James Almer <jamrial@gmail.com>
2017-04-13Merge commit '3e105d08848162b90d886bde59c010d4b0362a4b'James Almer
* commit '3e105d08848162b90d886bde59c010d4b0362a4b': build: Move entries related to building TOOLS to a subdirectory Makefile Merged-by: James Almer <jamrial@gmail.com>
2017-04-13Merge commit '4104cc56225f29ce1cded8b2876f8748460232a6'James Almer
* commit '4104cc56225f29ce1cded8b2876f8748460232a6': build: Warn that reconfiguration is necessary if version.h files changed Merged-by: James Almer <jamrial@gmail.com>
2017-04-13Merge commit 'f22da2cdf90dc892d483e2d4003cffc0500816f6'James Almer
* 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>
2017-04-13Merge commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e'James Almer
* commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e': configure: Pass CFLAGS_HEADERS through the right CFLAGS filter Merged-by: James Almer <jamrial@gmail.com>
2017-04-13Merge commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'Hendrik Leppkes
* 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>
2017-04-13tests: Fix gray10 and gray12 references after c1616b45.Carl Eugen Hoyos
2017-04-13avcodec/aacenc_ltp: fix use of uninitialized valuesJames Almer
Fixes some valgrind warnings. Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-13avformat/movenc: Fix potential leak of sgpd_entries array.Matthew Gregan
Signed-off-by: Matthew Gregan <kinetik@flim.org> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-13lsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16.Carl Eugen Hoyos