1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

84134 Commits

Author SHA1 Message Date
James Almer
663640d745 Merge commit '3fd22538bc0e0de84b31335266b4b1577d3d609e'
* commit '3fd22538bc0e0de84b31335266b4b1577d3d609e':
  prores: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
2017-03-19 15:30:13 -03:00
James Almer
aec42ebc27 Merge commit 'f81be06cf614919d71ded29b8f595bef40123ad8'
* commit 'f81be06cf614919d71ded29b8f595bef40123ad8':
  cavs: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
2017-03-19 15:23:52 -03:00
James Almer
4e4dfcac58 Merge commit '802727b538b484e3f9d1345bfcc4ab24cfea8898'
* commit '802727b538b484e3f9d1345bfcc4ab24cfea8898':
  vp8: Update some assembly comments left unchanged in bd66f073fe

Merged-by: James Almer <jamrial@gmail.com>
2017-03-19 15:18:31 -03:00
James Almer
e5623aafd8 Merge commit '87c6c78604e4dd16f1f45862b27ca006da010527'
* commit '87c6c78604e4dd16f1f45862b27ca006da010527':
  vp8: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
2017-03-19 15:11:44 -03:00
James Almer
4004d33fcb Merge commit 'd9d26a3674f31f482f54e936fcb382160830877a'
* commit 'd9d26a3674f31f482f54e936fcb382160830877a':
  vp56: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
2017-03-19 14:54:25 -03:00
Clément Bœsch
6a42a54b9d Merge commit '6892df9294d93322d43255ada299507465bc93c8'
* commit '6892df9294d93322d43255ada299507465bc93c8':
  vp3: Change type of stride parameters to ptrdiff_t

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 18:41:26 +01:00
Clément Bœsch
33dc6fcc4c Merge commit '963b3ab11f98fcc4a311f0dc7b268890c5675da2'
* commit '963b3ab11f98fcc4a311f0dc7b268890c5675da2':
  doc: Document FATE option HWACCEL

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 18:34:48 +01:00
Clément Bœsch
ed223eeab3 Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'
* commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb':
  av1: Add codec_id and basic demuxing support

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 18:28:40 +01:00
Clément Bœsch
f4a39ceea0 Merge commit '24130234cd9dd733116d17b724ea4c8e12ce097a'
* commit '24130234cd9dd733116d17b724ea4c8e12ce097a':
  rtpdec_mpeg4: validate fmtp fields

Merged with fixed log message.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 18:24:35 +01:00
Clément Bœsch
206a9fb29c Merge commit '46e3936fb04d06550151e667357065e3f646da1a'
* commit '46e3936fb04d06550151e667357065e3f646da1a':
  configure: Set __MSVCRT_VERSION__to 0x0700 for MinGW

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 18:21:56 +01:00
Clément Bœsch
a45a623d46 Merge commit '6755eb5b212384e0599f7f2c5de42df49fff57de'
* commit '6755eb5b212384e0599f7f2c5de42df49fff57de':
  mss12: validate display dimensions

This commit is a noop, see ee9151b616

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 18:20:18 +01:00
Clément Bœsch
d2f68be1e8 Merge commit '33f10546ec012ad4e1054b57317885cded7e953e'
* commit '33f10546ec012ad4e1054b57317885cded7e953e':
  vc1: check that slices have a positive height

This commit is a noop, see e985cfd18b

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 18:18:02 +01:00
Clément Bœsch
81bc1782b6 Merge commit '09b23786b3986502ee88d4907356979127169bdd'
* commit '09b23786b3986502ee88d4907356979127169bdd':
  pcx: use the bytestream2 API for reading from input

This commit is a noop, see 8cd1c0febe

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 18:17:24 +01:00
Clément Bœsch
ca619cdf54 Merge commit '221402c1c88b9d12130c6f5834029b535ee0e0c5'
* commit '221402c1c88b9d12130c6f5834029b535ee0e0c5':
  pcx: check that the packet is large enough before reading the header

See 8cd1c0febe

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:55:06 +01:00
Clément Bœsch
2da66630dc Merge commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b'
* commit '15ee419b7abaf17f8c662c145fe93d3dbf43282b':
  pcx: properly pad the scanline

This commit is a noop, see d24de4596c

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:51:56 +01:00
Clément Bœsch
d707e667c5 Merge commit '409d1cd2c955485798f8b0b0147c2b899b9144ec'
* commit '409d1cd2c955485798f8b0b0147c2b899b9144ec':
  cook: use the bytestream2 API for reading extradata

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:47:19 +01:00
Clément Bœsch
a0220d949f Merge commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b'
* commit 'bba9d8bdfb208b0ec2ccf182530347151ee3528b':
  qpeg: fix an off by 1 error in the MV check

See dd3bfe3cc1

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:39:49 +01:00
Clément Bœsch
f09aa73b30 Merge commit '796dca027be09334d7bbf4f2ac1200e06bb054cb'
* commit '796dca027be09334d7bbf4f2ac1200e06bb054cb':
  alac: do not return success if nothing was decoded

See e11983bda0

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:36:37 +01:00
Clément Bœsch
1080b7162f Merge commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b'
* commit 'f5d46d332258dcd8ca623019ece1d5e5bb74142b':
  vmnc: check that subrectangles fit into their containing rectangles

See 6ba02602aa

This merge keeps our condition against w-i and h-j instead of bw and bh.
One may be more correct than the other, but I'm keeping our behaviour
here for safety reasons.

The style and formatting is merged.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 17:24:49 +01:00
Clément Bœsch
01e188762f Merge commit '83b92a855e8e08bdec484e13ee5a7c8996224772'
* commit '83b92a855e8e08bdec484e13ee5a7c8996224772':
  golomb: Drop disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:12:41 +01:00
Clément Bœsch
a754fae4a7 Merge commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c'
* commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c':
  simple_idct: arm: Drop disabled code variant

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:12:07 +01:00
Clément Bœsch
8695ce73ca Merge commit 'e2b9993558b6adee42dcc6eb385a14943aaca974'
* commit 'e2b9993558b6adee42dcc6eb385a14943aaca974':
  simple_idct: x86: Drop disabled IDCT implementation

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:11:11 +01:00
Clément Bœsch
ff66ba6feb Merge commit '7effebde78977fafce935776153ea2f7c0981fa3'
* commit '7effebde78977fafce935776153ea2f7c0981fa3':
  dvbsubdec: Remove disabled, near-duplicate debug code

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:10:17 +01:00
Clément Bœsch
b2c5f5054b Merge commit '93fed46a92bab8be176d3e67be4354189a8dbe7f'
* commit '93fed46a92bab8be176d3e67be4354189a8dbe7f':
  timefilter: test: Drop some disabled debug cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:08:27 +01:00
Clément Bœsch
adef752f1b Merge commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65'
* commit '0e285c2f908789e96e29bfd969ad5eaaa0eece65':
  mpegvideo: Kill some disabled code

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:07:30 +01:00
Clément Bœsch
95a29b1a82 Merge commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c'
* commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c':
  msmpeg4: Drop disabled debug cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:06:49 +01:00
Clément Bœsch
87cd8dc0b0 Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'
* commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e':
  mathops: Drop disabled alternative mid_pred() implementation

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:05:13 +01:00
Clément Bœsch
56d63208d8 Merge commit 'be3363f664d7314d55b42860bd4077154752d769'
* commit 'be3363f664d7314d55b42860bd4077154752d769':
  nsv: Drop disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:04:46 +01:00
Clément Bœsch
1a48a51bfc Merge commit 'b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c'
* commit 'b53d8c3ccfeff77874f5ca7c68136b6d87a0a69c':
  mjpegdec: Drop disabled code

The last chunk is replaced with a comment describing the structure.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:03:25 +01:00
Clément Bœsch
7a6514861e Merge commit '34c22a9ca656603428b2c3490d1339c5a5966961'
* commit '34c22a9ca656603428b2c3490d1339c5a5966961':
  faan(i)dct: Kill some disabled code

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 16:00:21 +01:00
Clément Bœsch
83706367e2 Merge commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0'
* commit 'a4b1b5aa281cacde8351d9947b54ccf82ff10cd0':
  wc3movie: Drop unused cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:59:49 +01:00
Clément Bœsch
2f42aef3e4 Merge commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710'
* commit '17cb56b35672a2cd6ad7abe926e6cc772b8f4710':
  ffv1: Remove broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:58:43 +01:00
Clément Bœsch
b6e88bf323 Merge commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661'
* commit 'b96f0ab3d29cdd9ea9ddabfb2052f72bf8615661':
  h264: Kill broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:56:19 +01:00
Clément Bœsch
842e7853c7 Merge commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e'
* commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e':
  aac: Drop broken cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:54:44 +01:00
Clément Bœsch
92cd2c04b1 Merge commit '263efc095e6c7ec2902119118b084cea29ea8916'
* commit '263efc095e6c7ec2902119118b084cea29ea8916':
  jfdct: Kill broken cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:50:17 +01:00
Clément Bœsch
3eed90b1ed Merge commit 'd9442d13033a24b14ebae149dcdb42709430e2d9'
* commit 'd9442d13033a24b14ebae149dcdb42709430e2d9':
  rm: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:49:47 +01:00
Clément Bœsch
4ded6f9b31 Merge commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358'
* commit 'dab2034b8679aaacd8aef832cdeb71d0ee8a3358':
  roqvideoenc: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:49:15 +01:00
Clément Bœsch
8a403b00d1 Merge commit '562bec0e690760fb93deb2843a7237713103a191'
* commit '562bec0e690760fb93deb2843a7237713103a191':
  pnm_parser: Drop broken disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:48:50 +01:00
Clément Bœsch
18cdef9ab7 Merge commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c'
* commit 'a972fc1c0ab6e7f169f9145d6da46e8cedbc291c':
  wma: Kill non-compiling disabled cruft

See 0755033f8a

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:42:55 +01:00
Clément Bœsch
8e950c9b42 Merge commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e'
* commit 'aa37d2bf4505afc106e2a23c44afc722bb204a8e':
  swscale: Kill non-compiling disabled cruft

The isGray() chunk is not merged as an alternative patch actually fixing
the dead code is currently under review on the mailing-list.

The SWS_X chunk is merged, with an additional cosmetic.

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 15:40:03 +01:00
Clément Bœsch
efcba5a06a Merge commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf'
* commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf':
  mpeg4videoenc: Kill non-compiling disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 13:48:07 +01:00
Clément Bœsch
3f04964671 Merge commit 'e4d5b55193109d08be47c42d320334546c006b51'
* commit 'e4d5b55193109d08be47c42d320334546c006b51':
  rangecoder: Kill non-compiling disabled cruft

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-19 13:44:04 +01:00
Muhammad Faiz
de1308429a swresample/x86/resample: extend resample_double to support avx and fma3
benchmark:
sse2 10.670s
avx   8.763s
fma3  8.380s

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
2017-03-19 12:24:41 +07:00
Clément Bœsch
3d5c2169e4 Merge commit '00a0419c7f7ebce9010cba93b7ff67c9f1165815'
* commit '00a0419c7f7ebce9010cba93b7ff67c9f1165815':
  mathematics: Kill non-compiling disabled cruft

This commit is a noop, see 1e1513d01a

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 23:51:51 +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
2c400ba7d1 Merge commit '5a667322f5cb0e77c15891fc06725c19d8f3314f'
* commit '5a667322f5cb0e77c15891fc06725c19d8f3314f':
  vaapi_vc1: Remove redundant version check

This commit is a noop, see d07d01bcce

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:07:39 +01:00
Clément Bœsch
e788c50ce2 Merge commit '01d6f84f49a55fd591aa120960fce2b9dba92d0d'
* commit '01d6f84f49a55fd591aa120960fce2b9dba92d0d':
  vaapi_vc1: Constify pointers

This commit is a noop, see 845c2c140b

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:07:01 +01:00
Clément Bœsch
a6a6ed54d8 Merge commit 'ee9061293e925916fe2e0b7c08fbbd1f981b1d29'
* commit 'ee9061293e925916fe2e0b7c08fbbd1f981b1d29':
  vaapi_mpeg2: Constify pointers

This commit is a noop, see 6bc2808c41

Merged-by: Clément Bœsch <u@pkh.me>
2017-03-18 20:05:36 +01:00
Clément Bœsch
54d839e80a Merge commit '03adfe913062c6995136eb1ca51152b6d596c0f4'
* commit '03adfe913062c6995136eb1ca51152b6d596c0f4':
  vaapi_h264: Constify pointers

This commit is a noop, see d0897da924

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