1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-16 20:00:29 +02:00
Commit Graph

84857 Commits

Author SHA1 Message Date
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
46998d037f Merge commit 'fabfbfe5710050812147f93a351a53fdda56ff8c'
* commit 'fabfbfe5710050812147f93a351a53fdda56ff8c':
  dxva2: fix surface selection when compiled with both d3d11va and dxva2

This commit is a noop, see 153b36fc62

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 11:13:08 +02:00
Clément Bœsch
03f22c288a Merge commit 'db0b3dccb3842de134721e8d5c275f56d384340d'
* commit 'db0b3dccb3842de134721e8d5c275f56d384340d':
  libx265: Add option to force IDR frames

This commit is a noop, see 8a8902f221

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 11:10:11 +02:00
Clément Bœsch
80f91c8d5a Merge commit '3cba09e5228c889d63814dc43bc68f15c9dbac77'
* commit '3cba09e5228c889d63814dc43bc68f15c9dbac77':
  x86: Drop stray semicolons after function definitions

This commit is a noop, they are already fixed in FFmpeg.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 11:07:09 +02:00
Clément Bœsch
8524b0162f Merge commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d'
* commit 'd1ef1b9eaa45043ea5df5a004fb37243e05da61d':
  configure: Silence lld-link when getting the version number

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 11:04:12 +02:00
Clément Bœsch
aa7976fd15 Merge commit '392caa65df3efa8b2d48a80f08a6af4892c61c08'
* commit '392caa65df3efa8b2d48a80f08a6af4892c61c08':
  arm: vp9mc: Insert a literal pool at the middle of the file

This commit is a noop, see 68caef9d48

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:59:10 +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
6234fd2fa0 Merge commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966'
* commit '124e26971e69bb25f38c6c7cb3fa20c77cf10966':
  lavfi: Hardware map filter

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:51: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
77248d1218 Merge commit '6354957a95022864746180525680cca872ab0e0a'
* commit '6354957a95022864746180525680cca872ab0e0a':
  dnxhdenc: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:21:41 +02:00
Clément Bœsch
7b89015715 Merge commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6'
* commit 'c778eb15b89d875cb246b18f65b3b4321cb1e7d6':
  pixblockdsp: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:14:21 +02:00
Clément Bœsch
c223784ea7 Merge commit '99ddeddc7fc996c0c1e842112928490e78542bd5'
* commit '99ddeddc7fc996c0c1e842112928490e78542bd5':
  ituh263dec: Have function signature match across declaration and definition

This commit is a noop, see 2d2b363c65

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:12:43 +02:00
Clément Bœsch
4f96c11ed7 Merge commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481'
* commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481':
  vf_hwupload_cuda: Fix build error

This commit is a noop, see 78e871ebbc

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:07:00 +02:00
Clément Bœsch
a5745897e4 Merge commit '13fcdfb976038f63b9f753e2ebcc8e04d7c7abc2'
* commit '13fcdfb976038f63b9f753e2ebcc8e04d7c7abc2':
  svq3: Drop unused function dctcoef_get()

This commit is a noop, see 1e298e7724

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:06:01 +02:00
Clément Bœsch
b76dd6a678 Merge commit 'ee59f0540875ab42496af2aacddd942757707683'
* commit 'ee59f0540875ab42496af2aacddd942757707683':
  intrax8: Have function signature match across declaration and definition

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:03:59 +02:00
Clément Bœsch
a48c0c41c4 Merge commit '1a469a5e423bdad779b8534247dea8cc86169b88'
* commit '1a469a5e423bdad779b8534247dea8cc86169b88':
  options_table: Remove a now unnecessary include of config.h

This commit is a noop, see 76f43cbe26

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 09:58:09 +02:00
Clément Bœsch
d4bb093ad3 Merge commit 'ffbd1d2b0002576ef0d976a41ff959c635373fdc'
* commit 'ffbd1d2b0002576ef0d976a41ff959c635373fdc':
  arm: vp9: Add NEON optimizations of VP9 MC functions

This commit is a noop, see 68caef9d48

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 09:47:50 +02:00
Clément Bœsch
4503d678cb Merge commit '2e55e26b40e269816bba54da7d0e03955731b8fe'
* commit '2e55e26b40e269816bba54da7d0e03955731b8fe':
  vp9: Flip the order of arguments in MC functions

This commit is a noop, it was made to match our prototypes.

Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 09:35:37 +02:00
Michael Niedermayer
ad7aff0355 tests/fate/source-check: Use git grep in place of grep
grep -L is not posix, solaris default grep does not support it

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 03:12:05 +02:00
Michael Niedermayer
5f019909c0 avfilter: Add AV_OPT_FLAG_FILTERING_PARAM where it is missing
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 03:12:05 +02:00
James Almer
c14b3ea93c ffprobe: fix printing packet side data information
Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-29 21:20:06 -03:00
Matthieu Bouron
b5e1ec5660 Merge commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9'
* commit 'e3fb74f7f9a8f1895381355f40c92cac3c1023d9':
  lavfi: Always propagate hw_frames_ctx through links

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
2017-03-30 00:02:08 +02:00
Matthieu Bouron
78e871ebbc Merge commit '7e2561fa8313982aa21f7657953eedeeb33b210d'
* commit '7e2561fa8313982aa21f7657953eedeeb33b210d':
  lavfi: Use ff_get_video_buffer in all filters using hwframes
  vf_hwupload_cuda: Fix build error

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
2017-03-29 23:33:20 +02:00
Martin Vignali
b4016ef31a avcodec/exr: add support for uint32 2017-03-29 23:28:35 +02:00
Matthieu Bouron
b265e5ba50 Merge commit '7433feb82f75827884d909de34d341a1c4401d4a'
* commit '7433feb82f75827884d909de34d341a1c4401d4a':
  lavfi: Make default get_video_buffer work with hardware frames

Merged-by: Matthieu Bouron <matthieu.bouron@gmail.com>
2017-03-29 23:12:00 +02:00
Clément Bœsch
247d0339ca lavfi/signature: fix -Wformat warnings raised by DJGPP
This was forgotten due to the non-gpl build used in 549045254.
2017-03-29 16:09:30 +02:00
Clément Bœsch
a1b3ded902 Merge commit '2025d3787158ba272a1b8fbc0493fa20dd7a8484'
* commit '2025d3787158ba272a1b8fbc0493fa20dd7a8484':
  doc: Turn off noisy deprecation warnings in the option printer

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-29 15:20:10 +02:00
Clément Bœsch
72dbfe42ef Merge commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6'
* commit 'f4ca8ea92a8b36fe723412aefafc1b2fa89f8dc6':
  rtmpproto: Restructure zlib code to avoid unreachable code warning

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-29 15:17:59 +02:00
Clément Bœsch
a51867ee6b Merge commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5'
* commit 'baab87c4f30e75ea309294b06adcd01ce678bdc5':
  bink: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-29 15:09:26 +02:00
Clément Bœsch
d467740f45 lavc/idctdsp: use prefix restrict with av_ 2017-03-29 15:07:29 +02:00
Clément Bœsch
eaa67bb9c0 lavc/pthread_slice: remove pointless condition 2017-03-29 14:49:29 +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
4606807031 lavfi/xbr: undef PI if defined
This conflict with the DJGPP libc math.h which includes a PI macro (to
M_PI).

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.
2017-03-29 14:49:29 +02:00
Clément Bœsch
4ea8f57548 lavfi/psnr: rename pow2 to pow_2
This conflict with the DJGPP libc which includes a pow2 function¹

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.

[1]: http://www.delorie.com/djgpp/doc/libc-2.02/libc_536.html
2017-03-29 14:49:29 +02:00
Clément Bœsch
8f9edf89d5 lavfi/dynaudnorm: rename pow2 to pow_2
This conflict with the DJGPP libc which includes a pow2 function¹

We cannot make DJGPP POSIX only (using -D_POSIX_SOURCE) to avoid this
kind of symbols conflicts due to the lack of both posix_memalign and
memalign (DJGPP non standard function) in that POSIX mode. We currently
rely on memalign for aligned heap allocation.

[1]: http://www.delorie.com/djgpp/doc/libc-2.02/libc_536.html
2017-03-29 14:49:29 +02:00
Clément Bœsch
2d12b910f7 lavc: use av_fourcc2str() where appropriate 2017-03-29 14:49:29 +02:00
Clément Bœsch
bec96a7286 lavf: use av_fourcc2str() where appropriate 2017-03-29 14:49:29 +02:00
Clément Bœsch
d3cedc54cc lavf/ape: remove unused magic field 2017-03-29 14:49:29 +02:00
Clément Bœsch
656823220c ffmpeg_videotoolbox: fix usage of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00
Clément Bœsch
fa0a8faaa4 ffprobe: fix usage of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00
Clément Bœsch
337c68d071 tools/fourcc2pixfmt: fix usages of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00
Clément Bœsch
cd4d6cba12 lavf: fix usages of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00
Clément Bœsch
67e370ee52 lavc: fix usages of av_get_codec_tag_string() 2017-03-29 14:49:29 +02:00
Clément Bœsch
f156d35321 lavc: deprecate av_get_codec_tag_string() 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
c1d822c554 Merge commit '4cf2ffb7c45840b09bc49e34da88d4053dd442cb'
* commit '4cf2ffb7c45840b09bc49e34da88d4053dd442cb':
  idct: Have function pointer prototype match implementation

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-29 14:37:35 +02:00