Commit Graph

85058 Commits

Author SHA1 Message Date
f047da4ebe Merge commit '3cc3463f306f425f76bd962755df1132eeac6dfa'
* commit '3cc3463f306f425f76bd962755df1132eeac6dfa':
  avisynth: Support pix_fmts added to AviSynth+

This commit is mostly a noop, see
92916e8542.

Cosmetics and a small fix are merged.

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 12:16:45 +02:00
2738b4cee0 Merge commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9'
* commit 'aaae59700f7fc10fd80cb93b38c5d109900872d9':
  avisynth: Simplify the pix_fmt check for the newer AviSynth API

This commit is a noop, see 0ed5c3ce81

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 12:11:24 +02:00
fb1a2cbae1 Merge commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b'
* commit 'bcefafa226dcda23d4d9af9601d19389cb918a5b':
  avisynth: Fix setting stream timebase

This commit is a noop, see 8009a1f1fd

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 12:09:50 +02:00
e83a1c5b7c Merge commit '481ff3cf018811ba3235f1c236e970f32a6300b9'
* commit '481ff3cf018811ba3235f1c236e970f32a6300b9':
  fate: Add h264 and hevc extradata reload tests

Only the HEVC part is merged, see 00c8079816

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 12:07:50 +02:00
1ef8da77a5 Merge commit 'd5d62ce6d643de704e7bd62a2375e6391c0ffb9a'
* commit 'd5d62ce6d643de704e7bd62a2375e6391c0ffb9a':
  mov: Fix identity matrix boolean logic

This commit is a noop, see 7010ebdf1f

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 11:59:47 +02:00
edfa7ac8ec Merge commit '81d7f0bbca837afda1f7e60d3ae52ab1360ab44b'
* commit '81d7f0bbca837afda1f7e60d3ae52ab1360ab44b':
  checkasm: vp9dsp: Benchmark the dc-only version of idct_idct separately

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 11:54:29 +02:00
cdcdb7d32d Merge commit 'e7ae8f7a715843a5089d18e033afb3ee19ab3057'
* commit 'e7ae8f7a715843a5089d18e033afb3ee19ab3057':
  aarch64: vp9: loop filter: replace 'orr; cbn?z' with 'adds; b.{eq,ne};

This commit is a noop, see e7ae8f7a71

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 11:36:38 +02:00
33b80adaab Merge commit 'd7595de0b25e7064fd9e06dea5d0425536cef6dc'
* commit 'd7595de0b25e7064fd9e06dea5d0425536cef6dc':
  aarch64: vp9: use alternative returns in the core loop filter function

This commit is a noop, see 62ea07d797

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 11:32:53 +02:00
c1476219ca Merge commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce'
* commit 'e17567a831dede1f24e3a1a4c305a93012d7a8ce':
  libilbc: support for latest git of libilbc

This commit is a noop, see 59af5383c1

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 11:30:55 +02:00
ab04d9bf63 Merge commit 'ffe89e1edb0281ff65d1bda88253784e9283b717'
* commit 'ffe89e1edb0281ff65d1bda88253784e9283b717':
  configure: Move mjpeg_vaapi_decoder dependency declarations to the right place

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 11:29:34 +02:00
52e6fb9c59 Merge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56'
* commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56':
  golomb: Replace __PRETTY_FUNCTION__ with __func__ for tracing

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 11:26:23 +02:00
6516c62ec0 Merge commit 'fbd1f7639d0142c391bec85d1d840c835210843f'
* commit 'fbd1f7639d0142c391bec85d1d840c835210843f':
  af_asyncts: Use llabs instead of labs for 64-bit variable

This commit is a noop, see a8fe8d6b4a

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 11:25:37 +02:00
e06b8b07d5 Merge commit 'e0b164576f7467b7b1127c18175e215dc1df011f'
* commit 'e0b164576f7467b7b1127c18175e215dc1df011f':
  qsv: Add VP8 decoder

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 11:21:02 +02:00
fa0a6ce34d configure: Fix GPL dependency for avisynth / avxsynth. 2017-04-01 11:05:13 +02:00
f56a5fee37 Merge commit '182cf170a544bce069c8690c90b49381150a1f10'
* commit '182cf170a544bce069c8690c90b49381150a1f10':
  vp8: Return stream format information from parser

Return codes are adjusted to consume the whole packet in case of error
as the API does not allow returning AVERROR codes (a negative return
value is valid).

Merged-by: Clément Bœsch <u@pkh.me>
2017-04-01 10:17:32 +02:00
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
6171f178e7 x86/hevc_add_res: merge last remaining changes from 3d65359832
See https://lists.libav.org/pipermail/libav-devel/2016-October/079829.html
2017-03-31 20:49:45 -03:00
b62a87591e doc/libav-merge: link to the relevant ml thread in the extract_extradata line 2017-03-31 20:35:16 -03:00
6426f74272 fate/exr : add test for uint32 data
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-31 23:09:55 +02:00
678ab33861 Merge commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8'
* commit 'b6582b29277e00e5d49f400e58beefa5a21d83b8':
  qsv: Add VC-1 decoder

See fb57bc6c34.
Merged for cosmetic purposes to reduce differences with libav.

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:42:12 -03:00
99fa2fc5db Merge commit 'fea4dc05b41f5465bedc786b67966f204ec6150c'
* commit 'fea4dc05b41f5465bedc786b67966f204ec6150c':
  vc1: Return stream format information from parser

This commit is a noop, see 4df6605da7

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:18:37 -03:00
4fe9d69648 Merge commit '0940b748bdba36c4894fc8ea6be631d821fdf578'
* commit '0940b748bdba36c4894fc8ea6be631d821fdf578':
  qsvdec: Only warn about unconsumed data if it happens more than once

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:16:39 -03:00
1fb2c697d5 Merge commit '030d84fa2e35af0e77516735de35bf1a52371c86'
* commit '030d84fa2e35af0e77516735de35bf1a52371c86':
  qsvdec: Pass field order information to libmfx
  qsvdec: Pass the correct profile to libmfx

These commits are a noop, see 1f26a231bb

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:12:09 -03:00
b00f44e513 Merge commit '3297577f3eac1c87d48dedd527942de2bd28e7a5'
* commit '3297577f3eac1c87d48dedd527942de2bd28e7a5':
  mpegvideo: Return correct coded frame sizes from parser

This commit is a noop, see 309fe16a12

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:08:50 -03:00
c6f06876e1 Merge commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97'
* commit '31756abe29eb039a11c59a42cb12e0cc2aef3b97':
  aarch64: vp9: loop_filter: fix typo in skip flatout8 check
  aarch64: vp9: Implement NEON loop filters
  arm: vp9itxfm: Simplify txfm string comparisons

These commits are a noop, see
b4dc7c341e
f1212e472b

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 17:01:34 -03:00
74927355fc Merge commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29'
* commit '3c9546dfafcdfe8e7860aff9ebbf609318220f29':
  aarch64: vp9: Add NEON itxfm routines

This commit is a noop, see f43079e11c

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:56:19 -03:00
b27dd80255 doc/decode_audio: use <> to include libav* headers
Found-by: ubitux
2017-03-31 16:50:51 -03:00
10eb3259a6 Merge commit '01348e411f962f5e4605d649fc9a47a54587ba8e'
* commit '01348e411f962f5e4605d649fc9a47a54587ba8e':
  avconv_opt: Consistently iterate through hwaccels array in all cases

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:46:00 -03:00
b725b482c6 Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'
* commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6':
  Drop pointless void* casts

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:38:37 -03:00
fc2a94219d Merge commit 'd316f9cefcd854071985c6f524a9a15348240264'
* commit 'd316f9cefcd854071985c6f524a9a15348240264':
  aac: Drop pointless cast

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:33:48 -03:00
a4ee955113 Merge commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67'
* commit '8ddfa5ae5ef64a25dd087d74954ebdb9081f0d67':
  vf_drawtext: Drop wrong void* cast

This commit is a noop, see 4c96985af1

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:28:35 -03:00
8e7497e774 Merge commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125'
* commit 'fcbdd605b5409103c3f4bfa063ea270f2229b125':
  nut: Use correct function pointer casts instead of void*

This commit is a noop. Casts are not needed.

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:25:23 -03:00
c4fd1e7b01 Merge commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e'
* commit '3b50dbc51fb0978d09c1a5b83d4bf5a59d170e1e':
  ratecontrol: Use correct function pointer casts instead of void*

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:19:30 -03:00
66e7b421fa Merge commit 'dd299a2d6d4d1af9528ed35a8131c35946be5973'
* commit 'dd299a2d6d4d1af9528ed35a8131c35946be5973':
  arm: vp9: Add NEON loop filters

This commit is a noop, see 6bec60a683

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:17:41 -03:00
a1afcf8b8c Merge commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e'
* commit 'f7d183f08472e566a2e6b62a80e200a12670ed0e':
  libxvid: Check return value of write() call

This commit is a noop, see 25f35df115

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:13:04 -03:00
804ae6e30f Merge commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9'
* commit 'e5e8a26dcf6d572e841a7a191e4c96524367e3f9':
  libxvid: Use proper context in av_log() calls

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:10:32 -03:00
ef516efad4 Merge commit '12db2832e41aa71b5903ef7fa5c59c5473ded2c5'
* commit '12db2832e41aa71b5903ef7fa5c59c5473ded2c5':
  libxvid: Require availability of mkstemp()

This commit is a noop. Our libxvid wrapper doesn't use mkstemp().

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:05:53 -03:00
037522a75a Merge commit 'a67ae67083151f2f9595a1f2d17b601da19b939e'
* commit 'a67ae67083151f2f9595a1f2d17b601da19b939e':
  arm: vp9: Add NEON itxfm routines

This commit is a noop, see b4dc7c341e

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 16:00:31 -03:00
5e7288480f Merge commit '0b37cd09a67c3ba4db044404b99c65a32b4ad932'
* commit '0b37cd09a67c3ba4db044404b99c65a32b4ad932':
  checkasm: add vp9dsp.itxfm_add tests.

This commit is a noop, see 0b227c6d47

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:58:01 -03:00
a9134fa713 Merge commit 'fd0fae60372cddbe0bec8830d07e760195f80bad'
* commit 'fd0fae60372cddbe0bec8830d07e760195f80bad':
  pthread_frame: Unreference hw_frames_ctx on per-thread codec contexts

This commit is a noop, see fb69a8e1f1

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:52:57 -03:00
bf624e993d Merge commit '11623217e3c9b859daee544e31acdd0821b61039'
* commit '11623217e3c9b859daee544e31acdd0821b61039':
  arm: vp9mc: Use a different helper register for PIC loads

This commit is a noop, see 68caef9d48

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:50:22 -03:00
f6e37665a9 Merge commit '824e8c284054f323f854892d1b4739239ed1fdc7'
* commit '824e8c284054f323f854892d1b4739239ed1fdc7':
  arm: Clear the gp register alias at the end of functions

This commit is a noop, see 86c5a23ee5

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:48:52 -03:00
ebe9808aaa Merge commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b'
* commit '905cdcaa9d081d3d945ce555b27b43a75c3af57b':
  examples/decode_audio: Add missing header for av_free()

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:46:13 -03:00
67eda469ab Merge commit '6a62795d4051f435a9a2c59395d96913693922f8'
* commit '6a62795d4051f435a9a2c59395d96913693922f8':
  aarch64: h264idct: Use the offset parameter to movrel

This commit is a noop, see da5c8284c0

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:43:28 -03:00
8408c2efe4 Merge commit '557c1675cf0e803b2fee43b4c8b58433842c84d0'
* commit '557c1675cf0e803b2fee43b4c8b58433842c84d0':
  arm: vp9mc: Minor adjustments from review of the aarch64 version

This commit is a noop, see 68caef9d48

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:40:41 -03:00
2348eb1714 Merge commit '383d96aa2229f644d9bd77b821ed3a309da5e9fc'
* commit '383d96aa2229f644d9bd77b821ed3a309da5e9fc':
  aarch64: vp9: Add NEON optimizations of VP9 MC functions

This commit is a noop, see 1f7801c2bc

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:35:31 -03:00
183635b9e9 doc/libav-merge: mention aac_adtstoasc extradata update fix for matroska 2017-03-31 15:33:48 -03:00
afac31d2b2 Merge commit 'c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c'
* commit 'c44a8a3eabcd6acd2ba79f32ec8a432e6ebe552c':
  aarch64: Add an offset parameter to the movrel macro

This commit is a noop, see 7fe898dbb9

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:23:11 -03:00
28bace5c0a Merge commit 'a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc'
* commit 'a4cfcddcb0f76e837d5abc06840c2b26c0e8aefc':
  vp9: Make the subpel filters non-static

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:20:01 -03:00
51d95914e0 Merge commit '98cae966c77875e26c5958206a6cfe7eba6269e8'
* commit '98cae966c77875e26c5958206a6cfe7eba6269e8':
  matroskaenc: write updated STREAMINFO metadata for FLAC streams if available

This commit is a noop, see 8c1342e631

Merged-by: James Almer <jamrial@gmail.com>
2017-03-31 15:17:16 -03:00