wrapper/FFmpeg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
114649 commits 40 branches 405 tags 230 MiB
Commit graph

6193 commits

Author SHA1 Message Date
Michael Niedermayer
e1cc7f83df Bump minor for 3.3 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-04-02 19:49:45 +02:00
Hendrik Leppkes
5c612c5ff8 Merge commit 'e18ba2dfd2' 
* commit 'e18ba2dfd2':
  hwcontext_dxva2: make sure the sw frame format is the right one during transfer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2017-04-01 18:53:40 +02:00
Hendrik Leppkes
0f9ce9c5fc Merge commit '5a1d605cea' 
* commit '5a1d605cea':
  hwcontext_dxva2: split transfer_data() into upload/download functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2017-04-01 18:53:36 +02:00
Hendrik Leppkes
fbfa72916c Merge commit '9d7026574b' 
* commit '9d7026574b':
  hwcontext_dxva2: fix handling of the mapping flags

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2017-04-01 18:53:32 +02:00
Hendrik Leppkes
d91e7aac12 Merge commit '0d3176e32f' 
* commit '0d3176e32f':
  hwcontext_dxva2: do not assume the destination format during mapping is always the right one

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2017-04-01 18:53:27 +02:00
Steven Liu
99e5d81ef9 avutil/avstring: add av_strreplace API into avstring 
refer to: http://creativeandcritical.net/str-replace-c
add av_strreplace API for replace string operations.

Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 2017-04-01 10:55:04 +08:00
Martin Storsjö
10f4511f14 libavutil: Make LOCAL_ALIGNED(xx be equal to LOCAL_ALIGNED_xx( 
Previously, the former form always produced a manually aligned,
padded buffer, while the latter can use DECLARE_ALIGNED, if that
amount of stack alignment is supported.

libavutil/internal.h needs to include mem.h, since it uses
the DECLARE_ALIGNED macro.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2017-03-31 22:06:52 +03:00
James Almer
9033e8723c avutil/spherical: add av_spherical_projection_name() 
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-31 13:26:56 -03:00
Michael Niedermayer
58b867a7cf Bump minor versions for master after release/3.3 branchpoint 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-31 13:21:06 +02:00
Michael Niedermayer
fc332f3e29 Bump minor versions for staring release/3.3 branch 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-31 13:21:06 +02:00
Clément Bœsch
82ad9cbd32 Merge commit '17dac56b8f' 
* commit '17dac56b8f':
  lavu: Rename ycgco color space appropriately

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-31 09:46:51 +02:00
Michael Niedermayer
afebf470ca avutil/tests/dict: Check return of av_dict_parse_string() 
Fixes: CID1396402

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2017-03-30 23:35:18 +02:00
Mark Thompson
e3f9c5826a Merge commit 'e8bbacbf52' 
* commit 'e8bbacbf52':
  hwcontext_qsv: support frame mapping

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-30 21:54:46 +01:00
Mark Thompson
546524056d Merge commit '8ea15afbf2' 
* commit '8ea15afbf2':
  hwcontext_qsv: transfer data through the child context when VPP fails

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-30 21:18:23 +01:00
Mark Thompson
7cb082ac2f Merge commit 'b91ce48600' 
* commit 'b91ce48600':
  hwcontext_qsv: do not fail when download/upload VPP session creation fails

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-30 21:16:58 +01:00
Mark Thompson
59b1942aae Merge commit 'b115a35ea6' 
* commit 'b115a35ea6':
  hwcontext_qsv: add support for the P8 format

Merged-by: Mark Thompson <sw@jkqxz.net>
 2017-03-30 21:16:09 +01:00
Hendrik Leppkes
14764b93e2 Merge commit '10065d9324' 
* commit '10065d9324':
  hwcontext_dxva2: add support for the P8 format

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2017-03-30 11:37:39 +02:00
Hendrik Leppkes
9ca5d2de5d Merge commit '9109737654' 
* commit '9109737654':
  hwcontext_dxva2: frame mapping support

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
 2017-03-30 11:33:51 +02:00
Clément Bœsch
71c22fb7ae Merge commit '8ad9f9d675' 
* commit '8ad9f9d675':
  hwcontext_vaapi: Frame mapping support

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:55:32 +02:00
Clément Bœsch
4cda23f1f1 Merge commit 'd06aa24ba5' 
* commit 'd06aa24ba5':
  hwcontext: Hardware frame mapping

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:36:37 +02:00
Clément Bœsch
03f5e80bdb Merge commit '67351924fa' 
* commit '67351924fa':
  Drop unreachable break and return statements

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:26:29 +02:00
Clément Bœsch
f291a9a1ad Merge commit '99434f4df8' 
* commit '99434f4df8':
  float_dsp: Have implementation match function pointer prototype

Merged-by: Clément Bœsch <cboesch@gopro.com>
 2017-03-30 10:23:25 +02:00
Clément Bœsch
549045254c Fix all -Wformat warnings raised by DJGPP 2017-03-29 14:49:29 +02:00
Clément Bœsch
1473afac5d lavu/mem: clamp alignment to 16 for DJGPP 
See also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80208
 2017-03-29 14:49:29 +02:00
Clément Bœsch
bfdcdd6d82 lavu: add av_fourcc_make_string() and av_fourcc2str() 2017-03-29 14:49:29 +02:00
Mark Thompson
1bd986ed4b hwcontext: Move NONE to the be the first member of AVHWDeviceType 
Also use that to fix a warning in av_hwdevice_get_type_name().
 2017-03-27 21:54:06 +01:00
Clément Bœsch
2a69724fd5 Merge commit '0456e68439' 
* commit '0456e68439':
  audio_fifo: Drop write-only variable

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-24 13:17:55 +01:00
Clément Bœsch
0b3decc596 Merge commit '0d9b9bd37f' 
* commit '0d9b9bd37f':
  lavu: Add JEDEC P22 color primaries

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-24 11:21:46 +01:00
Clément Bœsch
a44ab512e6 lavu/pixfmt: fix redundant comment 
Mistake introduced in a1f6b1d9d8.
 2017-03-24 11:17:51 +01:00
James Almer
c97e986e90 Merge commit '7911186ed6' 
* commit '7911186ed6':
  emms: Give apriv_emms_yasm() a more general name

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-23 18:28:56 -03:00
James Almer
29db87af52 Merge commit '6be7944ee2' 
* commit '6be7944ee2':
  x86: Add missing colons after assembly labels

Merged-by: James Almer <jamrial@gmail.com>
 2017-03-23 18:05:27 -03:00
Clément Bœsch
a1f6b1d9d8 Merge commit '310c55f179' 
* commit '310c55f179':
  pixfmt: Document alternative names for smpte 431 and 432

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-23 11:22:32 +01:00
Vittorio Giovara
5f90ad99bb spherical: Change types of bounding and pad to uint32_t 
These values are defined to be 32bit in the specification,
so it makes more sense to store them as fixed width.

Based on a patch by Micahel Niedermayer <michael@niedermayer.cc>.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2017-03-23 10:09:18 +01:00
Vittorio Giovara
35cf146a33 lavu: Drop deprecated av_dlog macro 
Deprecated in 05/2015.
 2017-03-23 10:09:17 +01:00
Vittorio Giovara
619a433eca lavu: Drop deprecated option type 
Deprecated in 02/2014.
 2017-03-23 10:09:17 +01:00
Vittorio Giovara
dd343fd986 lavu: Drop deprecated VDPAU pixel formats 
Deprecated in 07/2013.
 2017-03-23 10:09:17 +01:00
Vittorio Giovara
0648dec19d lavc: Drop deprecated stream codec tag 
Deprecated in 07/2015.
 2017-03-23 10:09:17 +01:00
Diego Biurrun
dcc39ee10e lavc: Remove deprecated XvMC support hacks 
Deprecated in 11/2013.
 2017-03-23 10:09:14 +01:00
Vittorio Giovara
07a2b15594 Bump major versions of all libraries 
This disables everything that was deprecated at least 18 months ago.

Readjust the minimum API version as needed, postponing any
API-incompatible changes until the next bump.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2017-03-23 09:56:20 +01:00
Clément Bœsch
443e969293 Merge commit '27079a426c' 
* commit '27079a426c':
  buffer: convert to stdatomic

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-22 17:46:01 +01:00
Clément Bœsch
67d8eabdbb lavu/buffer: drop USE_ATOMICS 
USE_ATOMICS is only set if there is no thread implementation enabled, in
which case you can't expect any lock mechanism from FFmpeg.

This is also conflicting with the incoming use of stdatomic.
 2017-03-22 17:40:03 +01:00
Martin Storsjö
8e2346154e libavutil: Hook up the rest of the gcc specific attributes to clang as well 
Hook up all attributes that don't have a MSVC specific version at the
moment.

See f637046d31 for details.

These don't seem to be critical for building with clang in MSVC mode
though, and thus haven't been hooked up until now.

These seem to build fine with as old clang as 3.3 at least.
(clang 3.3 disguises itself as gcc 4.2 normally, so all of these
have been used for clang before, except for av_cold.)

The clang version numbers themselves are useless for detecting what
attributes are available, since Apple's clang builds use a completely
different versioning (presenting itself as e.g. clang 8.0 instead
of 3.8).

Signed-off-by: Martin Storsjö <martin@martin.st>
 2017-03-22 14:25:45 +02:00
Jun Zhao
9365dfcbf6 hwcontext: fix comments for av_hwdevice_ctx_alloc() 
fix the wrong comments for av_hwdevice_ctx_alloc()

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
 2017-03-22 00:58:42 +00:00
James Almer
d8962ffbd8 avutil/x86util: don't use movss in VBROADCASTSS macro when src and dst args are the same 
Reviewed-by: Henrik Gramner <henrik@gramner.com>
Signed-off-by: James Almer <jamrial@gmail.com>
 2017-03-21 19:15:00 -03:00
Martin Storsjö
3aa9c523e9 libavutil: Define the noreturn attribute for clang in MSVC mode as well 
This is a follow-up to f637046d31.

Without the noreturn attribute set, avconv_opt.c fails to build after
d2e6dd32a4 with the error "control may reach end of non-void function".
By making sure the noreturn attribute is set properly, this compiles
as intended.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2017-03-21 22:57:21 +01:00
Mark Thompson
b7487f4f3c hwcontext: Make it easier to work with device types 
Adds functions to convert to/from strings and a function to iterate
over all supported device types.  Also adds a new invalid type
AV_HWDEVICE_TYPE_NONE, which acts as a sentinel value.
 2017-03-20 23:15:43 +00:00
Mark Thompson
b266ad56fe hwcontext: Add device derivation 
Creates a new device context from another of a different type which
refers to the same underlying hardware.
 2017-03-20 23:15:43 +00:00
Clément Bœsch
3898e346b3 Merge commit '07e1f99a1b' 
* commit '07e1f99a1b':
  x86util: Document SBUTTERFLY macro

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-20 18:38:07 +01:00
Clément Bœsch
2feef75cb5 Merge commit '09a145b3c8' 
* commit '09a145b3c8':
  hwcontext_vdpau: Remove duplicate definition of GET_CALLBACK

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-20 16:05:51 +01:00
Clément Bœsch
3835283293 Merge commit '4fb311c804' 
* commit '4fb311c804':
  Drop memalign hack

Merged, as this may indeed be uneeded since
46e3936fb0.

Merged-by: Clément Bœsch <u@pkh.me>
 2017-03-20 08:54:44 +01:00