Steve Lhomme
b378f5bd64
lavu: add support for Content Light Level side metadata
...
As found in HEVC.
Signed-off-by: James Almer <jamrial@gmail.com>
2017-04-06 11:26:25 -03:00
James Almer
d1ee6fb729
Merge commit '6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f'
...
* commit '6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f':
arm: warn/error on movrelx usage problematic with PIC on ELF
Merged-by: James Almer <jamrial@gmail.com>
2017-04-04 16:04:29 -03:00
Clément Bœsch
47d8410dac
Merge commit 'a1d9de304fe63614e3aa8117fef17491fa80093d'
...
* commit 'a1d9de304fe63614e3aa8117fef17491fa80093d':
Fix some mismatches between function parameter and doxygen parameter names.
Merged-by: Clément Bœsch <u@pkh.me>
2017-04-03 20:41:16 +02:00
Michael Niedermayer
22b0daa1b3
Bump versions for master after 3.3
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-02 19:54:12 +02:00
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 'e18ba2dfd2d19aedc8afccf011d5fd0833352423'
...
* commit 'e18ba2dfd2d19aedc8afccf011d5fd0833352423':
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 '5a1d605ceae448b476a525f7368ec452000d1f26'
...
* commit '5a1d605ceae448b476a525f7368ec452000d1f26':
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 '9d7026574bbbe67d004a1c32911da75375692967'
...
* commit '9d7026574bbbe67d004a1c32911da75375692967':
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 '0d3176e32f351d18d6174d8b05796829a75a4c6b'
...
* commit '0d3176e32f351d18d6174d8b05796829a75a4c6b':
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
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 '17dac56b8fdd80c594c39b76de3f27a7949afbde'
...
* commit '17dac56b8fdd80c594c39b76de3f27a7949afbde':
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 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6'
...
* commit 'e8bbacbf529049c401bfeea70d5e0b5d2c8b6de6':
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 '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d'
...
* commit '8ea15afbf2c1ec89b5d4bac1f0b8345e4b906a5d':
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 'b91ce4860054430d3712deb0d9487cac2fcb7d68'
...
* commit 'b91ce4860054430d3712deb0d9487cac2fcb7d68':
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 'b115a35ea62b8f479b48d99a601f0e157517301e'
...
* commit 'b115a35ea62b8f479b48d99a601f0e157517301e':
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 '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42'
...
* commit '10065d9324c2e35ce7040b6a2b9ebf6079bcbf42':
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 '910973765417f06a4a9ccbd006e4df74c32ecb01'
...
* commit '910973765417f06a4a9ccbd006e4df74c32ecb01':
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 '8ad9f9d675eab139aa2208722009eeed981460dd'
...
* commit '8ad9f9d675eab139aa2208722009eeed981460dd':
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 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0'
...
* commit 'd06aa24ba583ad08025da9e1b29afcd8218ff9b0':
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 '67351924fa91dea4339109100a4c0689f006581f'
...
* commit '67351924fa91dea4339109100a4c0689f006581f':
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 '99434f4df81b6801b2b535d5b9143305595784f6'
...
* commit '99434f4df81b6801b2b535d5b9143305595784f6':
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
Clément Bœsch
2a69724fd5
Merge commit '0456e684394dc5a7b98ab9ebb48396d743bf3730'
...
* commit '0456e684394dc5a7b98ab9ebb48396d743bf3730':
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 '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104'
...
* commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104':
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 '7911186ed616ae81dd8617d6d0e8b08c818db9d8'
...
* commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8':
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 '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'
...
* commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4':
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 '310c55f1799deab395319471a75c528d0fa7b30d'
...
* commit '310c55f1799deab395319471a75c528d0fa7b30d':
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
Clément Bœsch
443e969293
Merge commit '27079a426c9d3db918b158976e44b9b143d78e1c'
...
* commit '27079a426c9d3db918b158976e44b9b143d78e1c':
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
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
Clément Bœsch
3898e346b3
Merge commit '07e1f99a1bb41d1a615676140eefc85cf69fa793'
...
* commit '07e1f99a1bb41d1a615676140eefc85cf69fa793':
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 '09a145b3c837273b1379321e44386a3233156e75'
...
* commit '09a145b3c837273b1379321e44386a3233156e75':
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 '4fb311c804098d78e5ce5f527f9a9c37536d3a08'
...
* commit '4fb311c804098d78e5ce5f527f9a9c37536d3a08':
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
Clément Bœsch
a5cf6628d6
Merge commit 'f01f7a7846529b7c3ef343f117eaa2c0a1457af0'
...
* commit 'f01f7a7846529b7c3ef343f117eaa2c0a1457af0':
hwcontext_dxva2: use the special UC copy for downloading frames
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 08:37:40 +01:00
Clément Bœsch
8200b16a9c
Merge commit 'd7bc52bf456deba0f32d9fe5c288ec441f1ebef5'
...
* commit 'd7bc52bf456deba0f32d9fe5c288ec441f1ebef5':
imgutils: add a function for copying image data from GPU mapped memory
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-20 08:34:10 +01:00
Clément Bœsch
9c2436e1e7
lavu: add AV_PIX_FMT_FLAG_BAYER
2017-03-20 08:02:30 +01:00
Clément Bœsch
ea8efc9594
lavu/mathematics: split closing bracket out of ifdefery
2017-03-18 23:50:05 +01:00
Clément Bœsch
1e1513d01a
lavu/mathematics: document so-called "cruft"
2017-03-18 23:50:03 +01:00
Clément Bœsch
53587ca482
Merge commit 'ec021d48445a414325ad59a73f9cde3212b173e4'
...
* commit 'ec021d48445a414325ad59a73f9cde3212b173e4':
buffer: fix av_buffer_pool_init2() documentation
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 19:22:30 +01:00
Vittorio Giovara
f20bcec4c2
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-17 13:12:25 -04:00
Carl Eugen Hoyos
1cd58e9154
lavu/spherical: Make AVSphericalMapping pointer parameter const.
...
Reflects the actual code and silences a gcc warning:
ffprobe.c:1797:42: warning: passing argument 1 of 'av_spherical_tile_bounds' discards 'const' qualifier from pointer target type
2017-03-16 22:18:12 +01:00
Clément Bœsch
5e4a572699
Merge commit '24a362569bff1d4161742fffaca80a4a4428be8a'
...
* commit '24a362569bff1d4161742fffaca80a4a4428be8a':
buffer: fix av_buffer_realloc() when the data is offset wrt buffer start
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-16 21:42:45 +01:00