]> git.sesse.net Git - ffmpeg/log
ffmpeg
7 years agoavcodec/extract_extradata_bsf: use the parsing code from mpegvideo_split()
James Almer [Fri, 24 Mar 2017 21:10:53 +0000 (18:10 -0300)]
avcodec/extract_extradata_bsf: use the parsing code from mpegvideo_split()

Changes to the parsing code originally committed to mpegvideo_parser.c
in 73fb23dc5a5.
Required by some samples, like PVA_test-partial.pva

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavformat/mov: stop using deprecated codec flags
James Almer [Sun, 26 Mar 2017 00:36:10 +0000 (21:36 -0300)]
avformat/mov: stop using deprecated codec flags

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavfilter: stop using deprecated codec flags
James Almer [Sun, 26 Mar 2017 00:35:52 +0000 (21:35 -0300)]
avfilter: stop using deprecated codec flags

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavcodec: stop using deprecated codec flags
James Almer [Sun, 26 Mar 2017 00:35:15 +0000 (21:35 -0300)]
avcodec: stop using deprecated codec flags

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoffmpeg: stop using deprecated codec flags
James Almer [Sun, 26 Mar 2017 00:34:52 +0000 (21:34 -0300)]
ffmpeg: stop using deprecated codec flags

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoconfigure: cuvid hwaccels need the corresponding decoder, not the other way around
Timo Rothenpieler [Sat, 25 Mar 2017 21:31:22 +0000 (22:31 +0100)]
configure: cuvid hwaccels need the corresponding decoder, not the other way around

7 years agofate/checkasm: fix use of uninitialized memory on hevc_add_res tests
James Almer [Sat, 25 Mar 2017 01:11:34 +0000 (22:11 -0300)]
fate/checkasm: fix use of uninitialized memory on hevc_add_res tests

7 years agofate/checkasm: use LOCAL_ALINGED_32 on hevc_add_res tests
James Almer [Sat, 25 Mar 2017 01:11:22 +0000 (22:11 -0300)]
fate/checkasm: use LOCAL_ALINGED_32 on hevc_add_res tests

7 years agofate: mask errors while constructing report files
Clément Bœsch [Fri, 24 Mar 2017 21:28:02 +0000 (22:28 +0100)]
fate: mask errors while constructing report files

The first case was forgotten in 89790ba2bfc9d0dc5ad407c5724b6ee616ecde58.

Note: build_only=yes is one of the case where hiding the errors makes
sense.

7 years agolavc/xface: Reorder conditions to silence a gcc warning.
Carl Eugen Hoyos [Sun, 26 Feb 2017 10:03:50 +0000 (11:03 +0100)]
lavc/xface: Reorder conditions to silence a gcc warning.

libavcodec/xface.c:318:27: warning: assuming signed overflow does not occur when assuming that (X - c) > X is always false [-Wstrict-overflow]

7 years agoavcodec/tests/celp_math: Change IsAlmostEqual() to a function
Michael Niedermayer [Fri, 24 Mar 2017 16:45:56 +0000 (17:45 +0100)]
avcodec/tests/celp_math: Change IsAlmostEqual() to a function

Fixes empty statement, found by ubitux

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/tests: added test for celp_math.c
Thomas Turner [Fri, 24 Mar 2017 05:48:28 +0000 (22:48 -0700)]
avcodec/tests: added test for celp_math.c

Signed-off-by: Thomas Turner <thomastdt@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/dnxhd_parser: take into account compressed frame size and skip it
Paul B Mahol [Mon, 20 Mar 2017 21:47:48 +0000 (22:47 +0100)]
avcodec/dnxhd_parser: take into account compressed frame size and skip it

Fixes #6214 and vsynth1-dnxhd-720p-hr-lb.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agox86/hevc_add_res: merge missing changes from 3d6535983282bea542dac2e568ae50da5796be34
James Almer [Fri, 24 Mar 2017 14:23:33 +0000 (11:23 -0300)]
x86/hevc_add_res: merge missing changes from 3d6535983282bea542dac2e568ae50da5796be34

Unrolling the loops triplicates the size of the assembled output
while not generating any gain in performance.

7 years agoMerge commit 'fbe425c8d29e473a8f69ae2dc52b1a10b77f3b44'
Clément Bœsch [Fri, 24 Mar 2017 12:38:11 +0000 (13:38 +0100)]
Merge commit 'fbe425c8d29e473a8f69ae2dc52b1a10b77f3b44'

* commit 'fbe425c8d29e473a8f69ae2dc52b1a10b77f3b44':
  hap: Adjust printf length modifiers to match variable types

This commit is a noop, see 5a51ca2da7b76cad2a86476590c18b26a98eafbe

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '1263b2039eb5aaf1522e9de9f07c787ab30a5f50'
Clément Bœsch [Fri, 24 Mar 2017 12:29:45 +0000 (13:29 +0100)]
Merge commit '1263b2039eb5aaf1522e9de9f07c787ab30a5f50'

* commit '1263b2039eb5aaf1522e9de9f07c787ab30a5f50':
  Adjust printf conversion specifiers to match variable signedness

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'ca1e5eea0c7b72a6e30aa6488cfeced3a4853521'
Clément Bœsch [Fri, 24 Mar 2017 12:23:52 +0000 (13:23 +0100)]
Merge commit 'ca1e5eea0c7b72a6e30aa6488cfeced3a4853521'

* commit 'ca1e5eea0c7b72a6e30aa6488cfeced3a4853521':
  Remove some pointless TRACE level debug code

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea'
Clément Bœsch [Fri, 24 Mar 2017 12:21:04 +0000 (13:21 +0100)]
Merge commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea'

* commit '07eea5a5ded1141632aefecfa59dcdc26de2d7ea':
  nut: Drop pointless TRACE level debug code

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'c3dad1bf3b5e04e01c291b1ac41e6bef0adf2206'
Clément Bœsch [Fri, 24 Mar 2017 12:19:10 +0000 (13:19 +0100)]
Merge commit 'c3dad1bf3b5e04e01c291b1ac41e6bef0adf2206'

* commit 'c3dad1bf3b5e04e01c291b1ac41e6bef0adf2206':
  nsv: Drop unnecessary TRACE level debug code

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '47756f51fe836959ffa5c6e2baeacbd71e150069'
Clément Bœsch [Fri, 24 Mar 2017 12:18:24 +0000 (13:18 +0100)]
Merge commit '47756f51fe836959ffa5c6e2baeacbd71e150069'

* commit '47756f51fe836959ffa5c6e2baeacbd71e150069':
  dnxhdenc: Drop pointless, commented-out debug output

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '0456e684394dc5a7b98ab9ebb48396d743bf3730'
Clément Bœsch [Fri, 24 Mar 2017 12:17:55 +0000 (13:17 +0100)]
Merge commit '0456e684394dc5a7b98ab9ebb48396d743bf3730'

* commit '0456e684394dc5a7b98ab9ebb48396d743bf3730':
  audio_fifo: Drop write-only variable

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '0574780d7a196f87ddd89d6362f4c47f3532b4c4'
Clément Bœsch [Fri, 24 Mar 2017 12:15:15 +0000 (13:15 +0100)]
Merge commit '0574780d7a196f87ddd89d6362f4c47f3532b4c4'

* commit '0574780d7a196f87ddd89d6362f4c47f3532b4c4':
  h264_loopfilter: Do not print value of uninitialized variable

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '255526998501f0040ae43fe4848c817a97fc578a'
Clément Bœsch [Fri, 24 Mar 2017 12:14:03 +0000 (13:14 +0100)]
Merge commit '255526998501f0040ae43fe4848c817a97fc578a'

* commit '255526998501f0040ae43fe4848c817a97fc578a':
  mpegaudio: Do not print value of uninitialized variable

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '14cab426b03afd08bc9fe9b6e021a9543c4bdd7e'
Clément Bœsch [Fri, 24 Mar 2017 12:12:21 +0000 (13:12 +0100)]
Merge commit '14cab426b03afd08bc9fe9b6e021a9543c4bdd7e'

* commit '14cab426b03afd08bc9fe9b6e021a9543c4bdd7e':
  build: Hardcode avversion.h dependency

This commit is a noop, see:
4d0ac9aee920cd95c35fbf4cd0a073baf86ff4c2
4ae87554f3c8bc54db572873f5049427a7e6cb31

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'f22363c72968f1a1fc4881d8695ec7068b0aa03c'
Clément Bœsch [Fri, 24 Mar 2017 12:10:15 +0000 (13:10 +0100)]
Merge commit 'f22363c72968f1a1fc4881d8695ec7068b0aa03c'

* commit 'f22363c72968f1a1fc4881d8695ec7068b0aa03c':
  openssl: Avoid double semicolons after the GET_BIO_DATA macro

This commit is a noop, see fc83de7e1d0eab29942b4ceb67b49e66e7b99226

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '052b97855de2396e46682bcbae97f95a258816d4'
Clément Bœsch [Fri, 24 Mar 2017 12:07:50 +0000 (13:07 +0100)]
Merge commit '052b97855de2396e46682bcbae97f95a258816d4'

* commit '052b97855de2396e46682bcbae97f95a258816d4':
  aviocat: Support avio options

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '99aeae20de4d09ea313fdc619d4e2df825155e62'
Clément Bœsch [Fri, 24 Mar 2017 12:06:37 +0000 (13:06 +0100)]
Merge commit '99aeae20de4d09ea313fdc619d4e2df825155e62'

* commit '99aeae20de4d09ea313fdc619d4e2df825155e62':
  scale_npp: fix passthrough mode

This commit is a noop, see f524275ef93882f27c0067e85e8fb3c0fc1a762b

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '0aec37e625821040c103641eec9c1e7a1efa2952'
Clément Bœsch [Fri, 24 Mar 2017 12:04:33 +0000 (13:04 +0100)]
Merge commit '0aec37e625821040c103641eec9c1e7a1efa2952'

* commit '0aec37e625821040c103641eec9c1e7a1efa2952':
  vaapi_decode: Remove vestigial unmap code
  vaapi_decode: Clear parameter buffers to fix picture reuse

This merge is a noop, see 79307ae56374b35cf12563a7c8e3e759658f847e

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '754b20d7ebccbe8d316b12128c8cb433d5a516ac'
Clément Bœsch [Fri, 24 Mar 2017 12:01:56 +0000 (13:01 +0100)]
Merge commit '754b20d7ebccbe8d316b12128c8cb433d5a516ac'

* commit '754b20d7ebccbe8d316b12128c8cb433d5a516ac':
  vaapi_h264: fix RefPicList[] field flags.

This commit is a noop, see 88325c2e0b63abf4c3482cecd43870015123764a

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'ee050797664c7c74cae262ffab05006b55d47a11'
Clément Bœsch [Fri, 24 Mar 2017 11:57:46 +0000 (12:57 +0100)]
Merge commit 'ee050797664c7c74cae262ffab05006b55d47a11'

* commit 'ee050797664c7c74cae262ffab05006b55d47a11':
  openssl: Support version 1.1.0.

This commit is mostly a noop, see 798c6ecce50f26a53d48e2577a34fabe46b32eb9

Included the simplifications by Martin Storsjö and fixed the
GET_BIO_DATA() macro to prevent a warning after the simplifications.

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'
Clément Bœsch [Fri, 24 Mar 2017 11:43:49 +0000 (12:43 +0100)]
Merge commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94'

* commit '016387fe0fe3eff1a03ec0673bf4d2967f6cad94':
  rtmpdh: Don't use the OpenSSL DH struct

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '2f806622e1270d3ed1d41a53049a19673dafbe70'
Clément Bœsch [Fri, 24 Mar 2017 11:40:51 +0000 (12:40 +0100)]
Merge commit '2f806622e1270d3ed1d41a53049a19673dafbe70'

* commit '2f806622e1270d3ed1d41a53049a19673dafbe70':
  bktr: Use memset(0) instead of zero initialization for struct sigaction

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'ed48a9d8143d2575a4458589cebde69ec326afd8'
Clément Bœsch [Fri, 24 Mar 2017 11:37:09 +0000 (12:37 +0100)]
Merge commit 'ed48a9d8143d2575a4458589cebde69ec326afd8'

* commit 'ed48a9d8143d2575a4458589cebde69ec326afd8':
  checkasm: Add a test for HEVC add_residual

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b'
Clément Bœsch [Fri, 24 Mar 2017 11:29:21 +0000 (12:29 +0100)]
Merge commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b'

* commit '6d5636ad9ab6bd9bedf902051d88b7044385f88b':
  hevc: x86: Add add_residual() SIMD optimizations

See a6af4bf64dae46356a5f91537a1c8c5f86456b37

This merge is only cosmetics (renames, space shuffling, etc).

The functionnal changes in the ASM are *not* merged:
- unrolling with %rep is kept
- ADD_RES_MMX_4_8 is left untouched: this needs investigation

Merged-by: Clément Bœsch <u@pkh.me>
7 years agolavc/x86/hevc: rename hevc_res_add to hevc_add_res
Clément Bœsch [Fri, 24 Mar 2017 10:45:23 +0000 (11:45 +0100)]
lavc/x86/hevc: rename hevc_res_add to hevc_add_res

This will simplify incoming merge.

7 years agoMerge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'
Clément Bœsch [Fri, 24 Mar 2017 10:37:44 +0000 (11:37 +0100)]
Merge commit '043b0b9fb1481053b712d06d2c5b772f1845b72b'

* commit '043b0b9fb1481053b712d06d2c5b772f1845b72b':
  Replace leftover uses of -aframes|-dframes|-vframes with -frames:a|d|v

The merge also includes all our own occurences.

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e'
Clément Bœsch [Fri, 24 Mar 2017 10:31:30 +0000 (11:31 +0100)]
Merge commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e'

* commit '4b07ebf1eb13561492f7e3c30a67f34415016b3e':
  mov: Update colr values

Mostly noop, see a3cab3d43387add8914c1c471fc99d733227d81b

Only the use of av_color_{primaries,transfer,space}_name() is merged.

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104'
Clément Bœsch [Fri, 24 Mar 2017 10:20:41 +0000 (11:20 +0100)]
Merge commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104'

* commit '0d9b9bd37f43ee29ad9f709d85c8f3be9db71104':
  lavu: Add JEDEC P22 color primaries

Merged-by: Clément Bœsch <u@pkh.me>
7 years agolavu/pixfmt: fix redundant comment
Clément Bœsch [Fri, 24 Mar 2017 10:17:51 +0000 (11:17 +0100)]
lavu/pixfmt: fix redundant comment

Mistake introduced in a1f6b1d9d816ad7e6a8f071b0efa2638bc80e65e.

7 years agoMerge commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c'
James Almer [Thu, 23 Mar 2017 23:54:20 +0000 (20:54 -0300)]
Merge commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c'

* commit '7c9e2b295e4f70e8fedf9cceb12d95399a859a9c':
  Makefile: fix checking whether reconfiguring is required

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '59c90097a0eff0dc81fbec15b8900c929859d1e7'
James Almer [Thu, 23 Mar 2017 23:49:24 +0000 (20:49 -0300)]
Merge commit '59c90097a0eff0dc81fbec15b8900c929859d1e7'

* commit '59c90097a0eff0dc81fbec15b8900c929859d1e7':
  hevc: factor out a repeated condition

This commit is a noop. It doesn't apply as our codebase has diverged
too much.

Merged-by: James Almer <jamrial@gmail.com>
7 years agosws/tests/pixdesc_query: remove func wrappers
Clément Bœsch [Thu, 23 Mar 2017 21:46:28 +0000 (22:46 +0100)]
sws/tests/pixdesc_query: remove func wrappers

7 years agosws: make is{RGB,BGR}inInt functions
Clément Bœsch [Thu, 23 Mar 2017 21:51:15 +0000 (22:51 +0100)]
sws: make is{RGB,BGR}inInt functions

7 years agoMerge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'
James Almer [Thu, 23 Mar 2017 23:02:11 +0000 (20:02 -0300)]
Merge commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f'

* commit '0bfdcce4d42a6e654c00ea5f9237dc987626457f':
  hevc: move the SliceType enum to hevc.h

Merged-by: James Almer <jamrial@gmail.com>
7 years agodoc/libav-merge: add a line about the extract_extradata commits
James Almer [Thu, 23 Mar 2017 22:49:09 +0000 (19:49 -0300)]
doc/libav-merge: add a line about the extract_extradata commits

7 years agoMerge commit '096a8effa3f8f3455292c958c3ed07e798def7bd'
James Almer [Thu, 23 Mar 2017 22:41:50 +0000 (19:41 -0300)]
Merge commit '096a8effa3f8f3455292c958c3ed07e798def7bd'

* commit '096a8effa3f8f3455292c958c3ed07e798def7bd':
  lavf: check that the codec is supported by extract_extradata

This commit is a noop. The code it changes was reverted.
See 40fa9d416a2597b1f8a1b9096bfaf05ad367999c

Merged-by: James Almer <jamrial@gmail.com>
7 years agoRevert "Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'"
James Almer [Thu, 23 Mar 2017 22:34:00 +0000 (19:34 -0300)]
Revert "Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'"

This reverts commit 1c193ac1f9cfe703d6a1c36795f309ba5d14bf6e, reversing
changes made to 7ebc9f8df4035ecaa84ad4429480986e3e7597ae.

Several FATE tests started failing after this merge, so it's reverted
until it can be properly fixed.

7 years agoMerge commit '788544ff0ed6fe67fda80ad6d3a0796ace035584'
James Almer [Thu, 23 Mar 2017 21:45:56 +0000 (18:45 -0300)]
Merge commit '788544ff0ed6fe67fda80ad6d3a0796ace035584'

* commit '788544ff0ed6fe67fda80ad6d3a0796ace035584':
  audiodsp: x86: Remove pointless header file

This commit is a noop, see 6ec3dc97fcd27b619621cfb7313ce94764b16a93

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e'
James Almer [Thu, 23 Mar 2017 21:41:46 +0000 (18:41 -0300)]
Merge commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e'

* commit '1f821e5ad3f8ebacbbb362668561ad976c392c9e':
  configure: Print warnings after all other output

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9'
James Almer [Thu, 23 Mar 2017 21:35:49 +0000 (18:35 -0300)]
Merge commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9'

* commit 'b89804da9bad2d94dd95bf20ac6187447e9c17e9':
  x86: videodsp: Add parentheses to expression to work around warning

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'da4f8c8e35a867f2d9fed0fb75e16c81ab968637'
James Almer [Thu, 23 Mar 2017 21:33:50 +0000 (18:33 -0300)]
Merge commit 'da4f8c8e35a867f2d9fed0fb75e16c81ab968637'

* commit 'da4f8c8e35a867f2d9fed0fb75e16c81ab968637':
  fate: Update filter-pixfmts-scale gbrap12le hash missing from be9dba5c8a

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'
James Almer [Thu, 23 Mar 2017 21:31:36 +0000 (18:31 -0300)]
Merge commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b'

* commit 'dd5d4a0e1e3a30a254d1a57ecbdcedf230c6014b':
  checkasm: aarch64: Don't clobber x29 in checkasm_stack_clobber

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'
James Almer [Thu, 23 Mar 2017 21:28:56 +0000 (18:28 -0300)]
Merge commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8'

* commit '7911186ed616ae81dd8617d6d0e8b08c818db9d8':
  emms: Give apriv_emms_yasm() a more general name

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d'
James Almer [Thu, 23 Mar 2017 21:27:01 +0000 (18:27 -0300)]
Merge commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d'

* commit 'be9dba5c8abc6ecf0b8ee4ccb11c7850327fcf8d':
  swscale: Properly load alpha for planar rgb

This commit is a noop, see
4170a44bbc7b8dfbe9fe2fa28557fce90d998887
df36257a53561a51af969a6ea6319dd2579509b9

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'
James Almer [Thu, 23 Mar 2017 21:20:29 +0000 (18:20 -0300)]
Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'

* commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9':
  build: Add VSX-OBJS to SUBDIR_VARS

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '58224dc5f3d4fea40a8d55cca87291a960c11622'
James Almer [Thu, 23 Mar 2017 21:17:45 +0000 (18:17 -0300)]
Merge commit '58224dc5f3d4fea40a8d55cca87291a960c11622'

* commit '58224dc5f3d4fea40a8d55cca87291a960c11622':
  ppc: avcodec: Drop silly "_ppc" suffixes from files in ppc subdirectories

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2'
James Almer [Thu, 23 Mar 2017 21:13:58 +0000 (18:13 -0300)]
Merge commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2'

* commit '0cf86fabfa5820596cca2cfead63c6f8df76c3f2':
  vaapi_encode: Write sequence header as extradata

This commit is a noop. It has already been cherry-picked in
51020adcecf4004c1586a708d96acc6cbddd050a

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f'
James Almer [Thu, 23 Mar 2017 21:08:41 +0000 (18:08 -0300)]
Merge commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f'

* commit 'f9bb356e0eb38ab4df32df8276b71a0b2626538f':
  vaapi_h265: Include header for slice types

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'
James Almer [Thu, 23 Mar 2017 21:05:27 +0000 (18:05 -0300)]
Merge commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4'

* commit '6be7944ee2ec2f045e6eb9a93237e992c8b20ac4':
  x86: Add missing colons after assembly labels

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055'
James Almer [Thu, 23 Mar 2017 21:01:47 +0000 (18:01 -0300)]
Merge commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055'

* commit '2816f8a8bb33bd67fec5e94f5d357918caf4e055':
  build: Drop arch-specific checkasm Makefiles

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81'
James Almer [Thu, 23 Mar 2017 20:48:28 +0000 (17:48 -0300)]
Merge commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81'

* commit '93d5b022a9fd3a1a1f9c521a1eac7f0410e05b81':
  build: Drop duplicate asm recipe

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'c91d6a33f872574c95c8784277cf60ffcf6bff4f'
James Almer [Thu, 23 Mar 2017 20:38:20 +0000 (17:38 -0300)]
Merge commit 'c91d6a33f872574c95c8784277cf60ffcf6bff4f'

* commit 'c91d6a33f872574c95c8784277cf60ffcf6bff4f':
  checkasm: aarch64: Add filler args to make sure all parameters are passed on the stack

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6'
James Almer [Thu, 23 Mar 2017 20:36:53 +0000 (17:36 -0300)]
Merge commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6'

* commit 'f1b3e131385176c3c9d9783b25047856a0dcebf6':
  checkasm: aarch64: Clobber the stack before calling functions

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'a05cc56124b4f1237f6355784de821e3290ddb44'
James Almer [Thu, 23 Mar 2017 20:35:38 +0000 (17:35 -0300)]
Merge commit 'a05cc56124b4f1237f6355784de821e3290ddb44'

* commit 'a05cc56124b4f1237f6355784de821e3290ddb44':
  checkasm: arm/aarch64: Fix the amount of space reserved for stack parameters

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'
James Almer [Thu, 23 Mar 2017 19:52:42 +0000 (16:52 -0300)]
Merge commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4'

* commit '8e2ea691351c5079cdab245ff7bfa5c0f3e3bfe4':
  lavf: use the new bitstream filter for extracting extradata

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '89b35a139e838deeb32ec20d8d034c81014401d0'
James Almer [Thu, 23 Mar 2017 19:31:15 +0000 (16:31 -0300)]
Merge commit '89b35a139e838deeb32ec20d8d034c81014401d0'

* commit '89b35a139e838deeb32ec20d8d034c81014401d0':
  lavc: add a bitstream filter for extracting extradata from packets

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'f6e2f8a9ffda2247bffba991450990d075ea68e3'
James Almer [Thu, 23 Mar 2017 18:41:09 +0000 (15:41 -0300)]
Merge commit 'f6e2f8a9ffda2247bffba991450990d075ea68e3'

* commit 'f6e2f8a9ffda2247bffba991450990d075ea68e3':
  hevcdec: move parameter set parsing into a separate header

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153'
James Almer [Thu, 23 Mar 2017 18:12:23 +0000 (15:12 -0300)]
Merge commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153'

* commit '150c896a9e46b23b97debb0a5f66fbaeaa32f153':
  hevcdec: split ff_hevc_diag_scan* declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
7 years agoavcodec/hevc: add missing hevc.h header
James Almer [Thu, 23 Mar 2017 18:07:28 +0000 (15:07 -0300)]
avcodec/hevc: add missing hevc.h header

It was lost as part of a merge in 6397815be0bee10948387fcb90ead36ec2834ef7.

7 years agoMerge commit '645c6ff4231a75a71db58c8e6d06346068d2f949'
James Almer [Thu, 23 Mar 2017 17:57:32 +0000 (14:57 -0300)]
Merge commit '645c6ff4231a75a71db58c8e6d06346068d2f949'

* commit '645c6ff4231a75a71db58c8e6d06346068d2f949':
  hevcdec: drop the prototype of a non-existing function

This commit is a noop. The prototype in question is not in our tree.

Merged-by: James Almer <jamrial@gmail.com>
7 years agoMerge commit 'c359d624d3efc3fd1d83210d78c4152bd329b765'
James Almer [Thu, 23 Mar 2017 17:27:48 +0000 (14:27 -0300)]
Merge commit 'c359d624d3efc3fd1d83210d78c4152bd329b765'

* commit 'c359d624d3efc3fd1d83210d78c4152bd329b765':
  hevcdec: move decoder-independent declarations into a separate header

Merged-by: James Almer <jamrial@gmail.com>
7 years agoavcodec/bytestream: check for AV_HAVE_BIGENDIAN instead of HAVE_BIGENDIAN
James Almer [Thu, 23 Mar 2017 17:26:44 +0000 (14:26 -0300)]
avcodec/bytestream: check for AV_HAVE_BIGENDIAN instead of HAVE_BIGENDIAN

No need to include config.h for HAVE_BIGENDIAN when libavutil/avconfig.h
is already included.

7 years agoavcodec/nvenc: apply quantization factors to cqp
Timo Rothenpieler [Thu, 23 Mar 2017 16:10:25 +0000 (17:10 +0100)]
avcodec/nvenc: apply quantization factors to cqp

7 years agoavcodec/nvenc: Deprecate usage of global_quality, introducing qp
Timo Rothenpieler [Thu, 23 Mar 2017 16:01:40 +0000 (17:01 +0100)]
avcodec/nvenc: Deprecate usage of global_quality, introducing qp

7 years agoMerge commit '4abe3b049d987420eb891f74a35af2cebbf52144'
Clément Bœsch [Thu, 23 Mar 2017 15:48:41 +0000 (16:48 +0100)]
Merge commit '4abe3b049d987420eb891f74a35af2cebbf52144'

* commit '4abe3b049d987420eb891f74a35af2cebbf52144':
  hevc: rename hevc.[ch] to hevcdec.[ch]

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '6c31ba226968f12f898120dbb928dab34e03782b'
Clément Bœsch [Thu, 23 Mar 2017 15:41:16 +0000 (16:41 +0100)]
Merge commit '6c31ba226968f12f898120dbb928dab34e03782b'

* commit '6c31ba226968f12f898120dbb928dab34e03782b':
  avformat/matroska: fix MatroskaVideoFieldOrder enum values

This commit is a noop, see dc781459cc1a927a944c709c4cb400bb953a4f45

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '20b75970e43a030f959b17ff2dfd561174b6f24e'
Clément Bœsch [Thu, 23 Mar 2017 15:40:15 +0000 (16:40 +0100)]
Merge commit '20b75970e43a030f959b17ff2dfd561174b6f24e'

* commit '20b75970e43a030f959b17ff2dfd561174b6f24e':
  file protocol: handle the file: protocol string in file_check

This commit is a noop, see 77015443a84bb5dbed38eafc2ea26a2bf2641ed6

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1'
Clément Bœsch [Thu, 23 Mar 2017 15:37:58 +0000 (16:37 +0100)]
Merge commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1'

* commit '7d8d726be7dc46343ab1c98c339c1ed44bcb07c1':
  rtmpproto: Don't include a client version in the unencrypted C1 handshake

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'
Clément Bœsch [Thu, 23 Mar 2017 15:37:31 +0000 (16:37 +0100)]
Merge commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56'

* commit '9f23f77a532ca9c2b7dc4b5328bc413e4f6f5b56':
  rtmpproto: Don't include the libavformat version as "clientid"

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830'
Clément Bœsch [Thu, 23 Mar 2017 15:36:05 +0000 (16:36 +0100)]
Merge commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830'

* commit '8b5e0d17e70400eaf5dc3845b5c1df8b2b88d830':
  rtmpproto: Send chunk size on the network channel

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe'
Clément Bœsch [Thu, 23 Mar 2017 15:35:17 +0000 (16:35 +0100)]
Merge commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe'

* commit 'd6ded94036e43a04889f4ff2813a7f7dd60b82fe':
  rtmpproto: Lengthen the filename buffer when receiving streams

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '7395784ba72742b6daa62d35db4028e09f3fdf06'
Clément Bœsch [Thu, 23 Mar 2017 15:34:19 +0000 (16:34 +0100)]
Merge commit '7395784ba72742b6daa62d35db4028e09f3fdf06'

* commit '7395784ba72742b6daa62d35db4028e09f3fdf06':
  rtmpproto: Check the return from ff_amf_read_string

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'c9527bf3444c5332fa04931d32997308784fc862'
Clément Bœsch [Thu, 23 Mar 2017 15:31:15 +0000 (16:31 +0100)]
Merge commit 'c9527bf3444c5332fa04931d32997308784fc862'

* commit 'c9527bf3444c5332fa04931d32997308784fc862':
  Make the RELEASE file match with the most recent tag

This commit is noop.

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '881477c77bb10c3c62fda111b0f1f3554968bc78'
Clément Bœsch [Thu, 23 Mar 2017 15:25:36 +0000 (16:25 +0100)]
Merge commit '881477c77bb10c3c62fda111b0f1f3554968bc78'

* commit '881477c77bb10c3c62fda111b0f1f3554968bc78':
  swscale: Add the GBRAP12 output
  Add GBRAP12 pixel format support
  swscale: Enable GBRP12 output
  swscale: x86: Add some forgotten 12-bit planar YUV cases
  swscale: Add input support for 12-bit formats

This merge is noop, these commits are recrafted cherry-picks from
FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '1e93aa69a60815d1407a6c34d8da3f83ab193ad5'
Clément Bœsch [Thu, 23 Mar 2017 15:21:43 +0000 (16:21 +0100)]
Merge commit '1e93aa69a60815d1407a6c34d8da3f83ab193ad5'

* commit '1e93aa69a60815d1407a6c34d8da3f83ab193ad5':
  Add GBRP12 pixel format support

This commit is a noop, see e9757066e11a9acb98040489c1ffc8440cd74d0e

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'e7e5be8635c1cf0588d2a07e59374135de6da55a'
Clément Bœsch [Thu, 23 Mar 2017 15:08:49 +0000 (16:08 +0100)]
Merge commit 'e7e5be8635c1cf0588d2a07e59374135de6da55a'

* commit 'e7e5be8635c1cf0588d2a07e59374135de6da55a':
  APIchanges: Expand the name of recently added pixel formats

This commit is a noop, we don't have this entry.

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '14e7e19a90e9b45db7adeb4d40e7f16aa7404f28'
Clément Bœsch [Thu, 23 Mar 2017 15:03:43 +0000 (16:03 +0100)]
Merge commit '14e7e19a90e9b45db7adeb4d40e7f16aa7404f28'

* commit '14e7e19a90e9b45db7adeb4d40e7f16aa7404f28':
  lavc: bsf: Document input/output codecparam alloc/init process

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'eb542106029a9b28b4f76ff7c181eb4f542da9c4'
Clément Bœsch [Thu, 23 Mar 2017 15:02:11 +0000 (16:02 +0100)]
Merge commit 'eb542106029a9b28b4f76ff7c181eb4f542da9c4'

* commit 'eb542106029a9b28b4f76ff7c181eb4f542da9c4':
  swscale: Add missing yuv444p12 swapping

This commit is a noop, these pixel formats were introduced long ago and
present in the switch case.

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '112cee0241f5799edff0e4682b9e8639b046dc78'
Clément Bœsch [Thu, 23 Mar 2017 14:39:16 +0000 (15:39 +0100)]
Merge commit '112cee0241f5799edff0e4682b9e8639b046dc78'

* commit '112cee0241f5799edff0e4682b9e8639b046dc78':
  hevc: Add SSE2 and AVX IDCT

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoavcodec/videotoolboxenc: remove unused atomic header
James Almer [Wed, 22 Mar 2017 22:33:46 +0000 (19:33 -0300)]
avcodec/videotoolboxenc: remove unused atomic header

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavcodec/mediacodec: convert to stdatomic
James Almer [Wed, 22 Mar 2017 18:27:30 +0000 (15:27 -0300)]
avcodec/mediacodec: convert to stdatomic

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavcodec/h264_ps: Fix runtime error: signed integer overflow: 2147483647 + 26 cannot...
Michael Niedermayer [Tue, 21 Mar 2017 23:17:05 +0000 (00:17 +0100)]
avcodec/h264_ps: Fix runtime error: signed integer overflow: 2147483647 + 26 cannot be represented in type 'int'

Fixes: 902/clusterfuzz-testcase-4561155144024064
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/pictordec: runtime error: left shift of 15 by 28 places cannot be represented...
Michael Niedermayer [Tue, 21 Mar 2017 01:20:35 +0000 (02:20 +0100)]
avcodec/pictordec: runtime error: left shift of 15 by 28 places cannot be represented in type 'int'

Fixes: 898/clusterfuzz-testcase-6149765467209728
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/tiff: Check geotag count for being non zero
Michael Niedermayer [Tue, 21 Mar 2017 00:55:01 +0000 (01:55 +0100)]
avcodec/tiff: Check geotag count for being non zero

Fixes memleak
Fixes: 874/clusterfuzz-testcase-5252796175613952
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agohls: consistent use of user_agent
Jan Berkel [Fri, 17 Feb 2017 11:00:40 +0000 (12:00 +0100)]
hls: consistent use of user_agent

This came up while debugging a problem with mpv:
https://github.com/mpv-player/mpv/issues/4155

Signed-off-by: wm4 <nfxjfg@googlemail.com>
7 years agoMerge commit 'e3f941cb03b139b866a0ad6dc95fbe1b247d54af'
Clément Bœsch [Thu, 23 Mar 2017 11:17:39 +0000 (12:17 +0100)]
Merge commit 'e3f941cb03b139b866a0ad6dc95fbe1b247d54af'

* commit 'e3f941cb03b139b866a0ad6dc95fbe1b247d54af':
  checkasm: add a test for HEVC IDCT

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit '9b2ccafb480c94fd09cfb24306d5296dc013cf5b'
Clément Bœsch [Thu, 23 Mar 2017 11:15:39 +0000 (12:15 +0100)]
Merge commit '9b2ccafb480c94fd09cfb24306d5296dc013cf5b'

* commit '9b2ccafb480c94fd09cfb24306d5296dc013cf5b':
  aarch64: Add missing sign extension in ff_h264_idct8_add_neon

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8'
Clément Bœsch [Thu, 23 Mar 2017 11:11:05 +0000 (12:11 +0100)]
Merge commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8'

* commit 'cbd84b8a51aa656d71b7d6ed44bd89041ff081a8':
  nvenc: Fix error log

This commit is a noop, the error message is correct in FFmpeg.

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'da2848375a2e2121dad9f1e8cbd0ead4e3bf77d6'
Clément Bœsch [Thu, 23 Mar 2017 11:08:22 +0000 (12:08 +0100)]
Merge commit 'da2848375a2e2121dad9f1e8cbd0ead4e3bf77d6'

* commit 'da2848375a2e2121dad9f1e8cbd0ead4e3bf77d6':
  nvenc: Force high_444 profile for 444 input

This commit is a noop, see 20abda6b626c0efe1df298eab697d61ba52669c3

Merged-by: Clément Bœsch <u@pkh.me>
7 years agoMerge commit 'e4128c08d786eb5513578e8c6063671ba03226ab'
Clément Bœsch [Thu, 23 Mar 2017 11:03:25 +0000 (12:03 +0100)]
Merge commit 'e4128c08d786eb5513578e8c6063671ba03226ab'

* commit 'e4128c08d786eb5513578e8c6063671ba03226ab':
  Revert "hevc: x86: Refactor IDCT macro declarations"

So apparently this was technically correct be reverted due to
authorship. Reverted as well in FFmpeg for now...

See http://lists.libav.org/pipermail/libav-devel/2016-October/079560.html

Merged-by: Clément Bœsch <u@pkh.me>