1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-10-06 02:05:36 +02:00
Commit Graph

85837 Commits

Author SHA1 Message Date
Clément Bœsch
9bf3d84089 Merge commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5'
* commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5':
  build: Use _extralibs variable names instead of _libs everywhere

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-17 10:22:52 +02:00
Clément Bœsch
0ba67a8eb1 build: remove special freetype check
Since 52ccc4a0e was merged, it's pointless to keep our special version.
2017-04-17 10:03:26 +02:00
Clément Bœsch
0a0517bbf5 Merge commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c'
* commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c':
  build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-17 09:39:31 +02:00
Clément Bœsch
3675f545e7 Merge commit 'a7101eb40e69ada3872ec5aebe9c5c165745fb3a'
* 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-17 09:38:30 +02:00
Clément Bœsch
9ae1ffe641 Merge commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb'
* 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-17 09:28:34 +02:00
Clément Bœsch
3390a2be9d Merge commit 'af451ac0de6776e97d6a3ff95eac257b7964002e'
* commit 'af451ac0de6776e97d6a3ff95eac257b7964002e':
  configure: Drop redundant and partly bogus vaapi/vdpau header checks

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-15 18:38:45 +02:00
Clément Bœsch
d40e181bec Merge commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a'
* 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-15 18:36:30 +02:00
Aaron Levinson
9e86a61870 avdevice/decklink: remove pthread dependency
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-15 12:26:21 +02:00
Marton Balint
e854764729 ffplay: fix indentation
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-04-15 12:26:20 +02:00
Marton Balint
915bb78815 ffplay: convert to new decode API
Signed-off-by: Marton Balint <cus@passwd.hu>
2017-04-15 12:26:20 +02:00
Paul B Mahol
f6b5a5c7d0 avcodec/dnxhdenc: fix recent regression
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-15 09:23:43 +02:00
Carl Eugen Hoyos
b9e4bbc686 lavc/opus_pvq: Add missing copyright notices from libopus.
The file is based on libopus, analyzed by Rostislav Pehlivanov.
2017-04-15 07:45:17 +02:00
Steven Liu
5caaa3a49e avformat/hlsenc: add hls encrypt options
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-14 23:30:29 +08:00
Paul B Mahol
5dedb2afd6 avcodec/dnxhd*: add ff_dnxhd_get_hr_frame_size()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-14 16:09:07 +02:00
Paul B Mahol
34c2eea3d8 avcodec/dnxhdenc: make sure that mb_height > 255 can be stored
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-04-14 16:00:35 +02:00
Rostislav Pehlivanov
3f1c527bf5 opus_pvq: add resynth support and band encoding cost function
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-04-14 12:12:43 +01:00
James Almer
802d94c36e build: fix tools build dependencies
Found-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-13 21:03:55 -03:00
James Almer
074e636c5c Merge commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360'
* commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360':
  dxva2: Adjust multiple inclusion guard names to follow convention

This commit is a noop, see 180f9a0958

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 19:58:37 -03:00
James Almer
41b394bc61 Merge commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390'
* 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-13 19:56:17 -03:00
James Almer
652ffbeaf1 Merge commit '4efea4ce75fbea3e5f8be8040068bfaaffbb2718'
* commit '4efea4ce75fbea3e5f8be8040068bfaaffbb2718':
  APIChanges: Mention where release 12 was cut

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 19:53:14 -03:00
James Almer
34d7f337c1 Merge commit '3f75e5116b900f1428aa13041fc7d6301bf1988a'
* commit '3f75e5116b900f1428aa13041fc7d6301bf1988a':
  avio: Keep track of the amount of data written

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 19:49:20 -03:00
James Almer
c5fd47fa8a Merge commit 'fc85646ad495f3418042468da415af73a7a07334'
* 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

a86ebbf7f6
3c0328d58d
8c8f543b81

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 19:07:14 -03:00
Aaron Levinson
bceb3d0f86 Support building C++ files with MSVC
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-13 23:57:31 +02:00
James Almer
e688ca102e Merge commit 'd3da8a0035734529c4e26696c9a0c6cb56633838'
* commit 'd3da8a0035734529c4e26696c9a0c6cb56633838':
  omx: Fix allocation check

This commit is a noop, see 16a75304fe

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 18:31:44 -03:00
James Almer
1d94a6c48f Merge commit 'd32bdadda86b35c2960e4de877cf081b9d2dadb3'
* commit 'd32bdadda86b35c2960e4de877cf081b9d2dadb3':
  qsvdec: Fix memory leak on error

This commit is a noop, see b6f80b16d1

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 18:30:22 -03:00
James Almer
eab5d29810 Merge commit '6a93b596c5c3af31b843d63013a7985ffeea354d'
* commit '6a93b596c5c3af31b843d63013a7985ffeea354d':
  compat/atomics: add typecasts in atomic_compare_exchange_strong()

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 18:27:20 -03:00
James Almer
657c072036 Merge commit '2170017a1cd033b6f28e16476921022712a522d8'
* commit '2170017a1cd033b6f28e16476921022712a522d8':
  avutil: fix data race in av_get_cpu_flags()

This commit is a noop, see fed50c4304

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 18:25:30 -03:00
James Almer
f416a8d66a Merge commit 'd5759701a82926059ae3e2530805e900041a5419'
* commit 'd5759701a82926059ae3e2530805e900041a5419':
  libkvazaar: Add missing header #includes

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 18:18:54 -03:00
James Almer
64472bf0bc Merge commit '892acc70105df9e6f7773bdde85b3e9541098525'
* 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-13 18:17:09 -03:00
James Almer
0dd2777309 configure: add missing golomb dependency to hevcparse
Based on a dependency addition from fbec58daa2
2017-04-13 18:15:39 -03:00
James Almer
40f3f0298a Merge commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a'
* commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a':
  build: Drop stray golomb dependencies

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 18:14:04 -03:00
James Almer
14bc8d6755 Merge commit 'fbec58daa2351cbe9fc758d8735c23ff03313db4'
* commit 'fbec58daa2351cbe9fc758d8735c23ff03313db4':
  build: Add an internal component for hevc_ps code

This commit is a noop, see 498e9e8e2a

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:56:55 -03:00
James Almer
0050449a07 Merge commit 'f912fd767e55bbb5a1554bd99bacab007659609c'
* 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-13 17:54:02 -03:00
James Almer
b2798267c5 Merge commit 'e90137c045721a1635cc241eb1e1be1126389c38'
* 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
8f58ecc344
e7a6f8c972
4dcdecf471

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:49:44 -03:00
James Almer
7adfa7cdc6 Merge commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8'
* commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8':
  lavu: Add a video section to Doxygen documentation

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:31:15 -03:00
James Almer
7d3bb052c8 Merge commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb'
* commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb':
  build: Add missing Makefile entries and ifdefs for QSV hwaccels

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:27:43 -03:00
James Almer
27324825de Merge commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b'
* commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b':
  build: Ensure that the "all" target appears before all Makefile includes

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:22:58 -03:00
James Almer
8c71d1b060 Merge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'
* commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a':
  build: Have old H.264/HEVC nvenc encoders select their new counterparts

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:20:50 -03:00
James Almer
5dba808064 Merge commit '3e105d08848162b90d886bde59c010d4b0362a4b'
* commit '3e105d08848162b90d886bde59c010d4b0362a4b':
  build: Move entries related to building TOOLS to a subdirectory Makefile

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:17:20 -03:00
James Almer
7f933718dc Merge commit '4104cc56225f29ce1cded8b2876f8748460232a6'
* commit '4104cc56225f29ce1cded8b2876f8748460232a6':
  build: Warn that reconfiguration is necessary if version.h files changed

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:06:05 -03:00
James Almer
a5a56bd3df Merge commit 'f22da2cdf90dc892d483e2d4003cffc0500816f6'
* commit 'f22da2cdf90dc892d483e2d4003cffc0500816f6':
  configure: add -fPIE instead of -pie to C flags for ThreadSanitizer

This commit is a noop, see 3f55752cd5

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:03:31 -03:00
James Almer
41b8b2ca28 Merge commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e'
* commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e':
  configure: Pass CFLAGS_HEADERS through the right CFLAGS filter

Merged-by: James Almer <jamrial@gmail.com>
2017-04-13 17:01:01 -03:00
Hendrik Leppkes
1849d0caa5 Merge commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'
* 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-13 11:06:27 +02:00
Carl Eugen Hoyos
a45951c0a4 tests: Fix gray10 and gray12 references after c1616b45. 2017-04-13 08:19:48 +02:00
James Almer
8cd8c83317 avcodec/aacenc_ltp: fix use of uninitialized values
Fixes some valgrind warnings.

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-12 19:38:17 -03:00
Matthew Gregan
b905ba5bc1 avformat/movenc: Fix potential leak of sgpd_entries array.
Signed-off-by: Matthew Gregan <kinetik@flim.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-12 23:12:06 +02:00
Carl Eugen Hoyos
c1616b454d lsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16. 2017-04-12 23:00:04 +02:00
Carl Eugen Hoyos
d89ac691c9 lavf/isom: Remove codec point for WMAv2 that has never worked. 2017-04-12 22:53:21 +02:00
Carl Eugen Hoyos
a081acc440 configure: Fix decklink license dependency. 2017-04-12 22:49:06 +02:00
Marton Balint
1f94197536 ffprobe: only use custom logging callback if -show_log is set
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>
2017-04-12 20:21:11 +02:00