1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Commit Graph

85275 Commits

Author SHA1 Message Date
Michael Niedermayer
477ba8f939 avfilter/af_chorus & aecho: Handle NULL return from av_strtok()
Fixes CID1396260

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Michael Niedermayer
fe46d92c15 avcodec/clearvideo: Do not lose the return code of decode_mb()
Fixes CID1401671

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Clément Bœsch
2a68d3b1a5 Merge commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301'
* commit '88f0cf8cd30c8ea283430e6710a7bd98bb9c0301':
  avplay: Correct function pointer assignments in options array

This commit is a noop, see a9a1bc56ab

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:23:40 +02:00
Clément Bœsch
aac40dd615 Merge commit '943533d64c7fa7a1b2fc9559e67652c349d21d51'
* commit '943533d64c7fa7a1b2fc9559e67652c349d21d51':
  avconv: Correct function pointer assignments in options array

This commit is a noop, see 4c96985af1

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:22:52 +02:00
Clément Bœsch
9813df1189 Merge commit '43de8b328b62cf21ec176c3989065168da471a5f'
* commit '43de8b328b62cf21ec176c3989065168da471a5f':
  lzf: update pointer p after realloc

This commit is a noop, see bb6a7b6f75

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:22:07 +02:00
Clément Bœsch
62e46fac26 Merge commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c'
* commit 'ab839054e662d3227e1f795ba1dfd01fe1cf305c':
  swscale: Add GRAY12

This commit is a noop, see 19be5fb728

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:21:31 +02:00
Clément Bœsch
719f1a923f Merge commit '7471352f1915813cda725ce624607d84b5a3a61c'
* commit '7471352f1915813cda725ce624607d84b5a3a61c':
  pixfmt: Add GRAY12

This commit is a noop, see 638b216d4f

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:18:56 +02:00
Mark Thompson
ff821fdfce Merge commit '4ab61cd983b539749bd621ea271624ddb5196a8e'
* commit '4ab61cd983b539749bd621ea271624ddb5196a8e':
  qsv{enc,dec}: extend the internal frame allocator

Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 22:07:57 +01:00
Mark Thompson
c0f2a8eac1 Merge commit '00aeedd84105a17f414185bd33ecadebeddb3a27'
* commit '00aeedd84105a17f414185bd33ecadebeddb3a27':
  qsv{dec,enc}: use a struct as a memory id with internal memory allocator

Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 22:06:03 +01:00
Mark Thompson
2f18e452f8 Merge commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c'
* commit '404e51478ecad060249d5b9bee6ab39a8a9d8c1c':
  qsv{dec,enc}: always use an internal mfxFrameSurface1

Minor fixups for differences in the QSV encoder because of a53cc.

Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 22:00:03 +01: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
Michael Niedermayer
855305fac2 avfilter/vf_minterpolate: Use dx and dy
Fixes CID1396283 and CID1396284

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:46:31 +02:00
Michael Niedermayer
4798237f01 avfilter/deshake_opencl: Remove redundant return
Fixes: CID1396846

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:46:31 +02:00
Michael Niedermayer
4064f3f0df avfilter/af_sofalizer: Fix bad shift
Fixes CID1396835

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:46:31 +02: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
Michael Niedermayer
e976e68fc5 avcodec/atrac3: Check init_get_bits8() for failure
This is more for correctness than actually fixing a missing error path

Fixes CID1399967

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:13:38 +02:00
Gyan Doshi
2104e3383f avfilter/avf_abitscope: Correct range for framerate
Signed-off-by: Gyan Doshi <gyandoshi@gmail.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com> (via IRC)
2017-03-30 10:29:14 -08:00
Michael Niedermayer
59b8c2a4e6 doc/examples/encode_audio: Favor a sample rate close to 44khz instead of the maximum sample rate
This is an example, people will copy and use this. The maximum supported is quite
unreasonable as a default choice

Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 16:34:06 +02:00
Michael Niedermayer
004f27f0fb ffmpeg: Fix avframe memleak
Fixes CID1401674

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 16:34:06 +02:00
Michael Niedermayer
8779ec91b2 avformat/mux: Check return code of av_packet_split_side_data()
Fixes CID1403225

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 16:30:14 +02:00
Matthieu Bouron
03372d0a90 doc/examples/filtering_audio: switch to new decoding API 2017-03-30 16:20:13 +02:00
Matthieu Bouron
afd257b43f doc/examples/filtering_video: switch to new decoding API 2017-03-30 16:20:07 +02:00
Clément Bœsch
b22c4d822b doc/codecs: add jedec-p22 2017-03-30 13:59:15 +02:00
Leo Izen
7449169081 avformat/nut: Add HEVC and Opus support
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 13:26:04 +02: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
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