1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

88550 Commits

Author SHA1 Message Date
Michael Niedermayer
431eccd61e tests/ffserver.regression.ref: update checksums to what ffserver currently produces
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 00:18:33 +02:00
Michael Niedermayer
617f0c65e1 ffserver: Fix off by 1 error in path
Code suggested by ubitux

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 00:18:33 +02:00
Felicia Lim
c8c995bc1d libopus: Add channel mapping 2 support in libopusdec
Enables demuxing of Ambisonics content coded with channel mapping 2

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 00:18:33 +02:00
James Almer
6821b693ec Merge commit '5a969f64b9cf40bad923c73b66c3031b0018e848'
* commit '5a969f64b9cf40bad923c73b66c3031b0018e848':
  jack: Drop support for old (2012) JACK versions

Merged-by: James Almer <jamrial@gmail.com>
2017-10-24 19:17:02 -03:00
James Almer
4e9dc52a97 Merge commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b'
* commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b':
  hwcontext: Move NONE to the be the first member of AVHWDeviceType

Merged-by: James Almer <jamrial@gmail.com>
2017-10-24 19:14:22 -03:00
James Almer
c0683dce89 Merge commit '0b9a237b2386ff84a6f99716bd58fa27a1b767e7'
* commit '0b9a237b2386ff84a6f99716bd58fa27a1b767e7':
  hevc: Add NEON 4x4 and 8x8 IDCT

[15:12:59] <@ubitux> hevc_idct_4x4_8_c: 389.1
[15:13:00] <@ubitux> hevc_idct_4x4_8_neon: 126.6
[15:13:02] <@ubitux> our ^
[15:13:06] <@ubitux> hevc_idct_4x4_8_c: 389.3
[15:13:08] <@ubitux> hevc_idct_4x4_8_neon: 107.8
[15:13:10] <@ubitux> hevc_idct_4x4_10_c: 418.6
[15:13:12] <@ubitux> hevc_idct_4x4_10_neon: 108.1
[15:13:14] <@ubitux> libav ^
[15:13:30] <@ubitux> so yeah, we can probably trash our versions here

Merged-by: James Almer <jamrial@gmail.com>
2017-10-24 19:10:22 -03:00
Mark Thompson
59b00ffea3 cbs_h264: Fix format specifier 2017-10-24 23:07:58 +01:00
Mark Thompson
79d666aa57 cbs_mpeg2: Fix format specifier 2017-10-24 23:07:58 +01:00
Mark Thompson
5b2c71bb94 cbs_mpeg2: Fix type for marker_bit reading 2017-10-24 23:07:58 +01:00
Jun Zhao
f31478ba14 lavc/vaapi_encode_h264: correct VUI max_dec_frame_buffering setting
This should refer to the existing SPS structure, not the VAAPI sequence
parameter buffer (which is not yet initialised).

Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Wang, Yi A <yi.a.wang@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
2017-10-24 23:06:26 +01:00
Carl Eugen Hoyos
6e16547685 lavc/dvbsub: Add the missing line separator to dvb_encode_rle8().
Fixes 256-colour dvb subtitle encoding.

Fixes ticket #6769.
2017-10-24 22:49:04 +02:00
JULIAN GARDNER
df95f145be lavc/dvbsub: Do not fail hard in the region block for 256-colour encoding.
Adds a hunk forgotten in 8a6799d2
2017-10-24 22:46:00 +02:00
Carl Eugen Hoyos
3c14547eb7 lavfi/tests/filtfmts: Constify a variable.
Fixes the following warning:
libavfilter/tests/filtfmts.c: In function ‘main’:
libavfilter/tests/filtfmts.c:103:18: warning: assignment discards ‘const’ qualifier from pointer target type
2017-10-24 22:32:59 +02:00
James Almer
acf70639fb Merge commit '75ef91543422049a01b594925fcdb182ea12eb09'
* commit '75ef91543422049a01b594925fcdb182ea12eb09':
  configure: Disable inline assembly for PathScale compilers

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 20:47:23 -03:00
James Almer
ce1b1f00bd Merge commit 'fe6eea99efac66839052af547426518efd970b24'
* commit 'fe6eea99efac66839052af547426518efd970b24':
  nsvdec: don't ignore the return value of av_get_packet()

This commit is a noop, see
edf1cb7aee
8d7ce5cdb7

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 19:58:04 -03:00
James Almer
cd541de9dc Merge commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1'
* commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1':
  rtmpproto: send swfverify value as swfurl if latter is unused

This commit is a noop, see c0b3781bf2

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 19:54:45 -03:00
James Almer
4e6c85b3ba Merge commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd'
* commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd':
  configure: Skip check for inline assembly capabilities when explicitly disabled

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 19:42:23 -03:00
James Almer
a60fb1f88f Merge commit '083ea8768121ee800893e124b08483011b798919'
* commit '083ea8768121ee800893e124b08483011b798919':
  APIchanges: Update bump dates

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 19:17:31 -03:00
James Almer
6a426693cc Merge commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24'
* commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24':
  avplay: Use the named syntax for buffersrc arguments

This commit is a noop, see 251f398798

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 19:14:20 -03:00
James Almer
0acb18d298 Merge commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6'
* commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6':
  vf_showinfo: Display spherical properties

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 18:51:34 -03:00
James Almer
69bb3f7bff Merge commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe'
* commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe':
  vf_showinfo: Simplify reporting stereo3d information

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 18:49:22 -03:00
James Almer
2f4677a11f Merge commit '5f90ad99bb7e53383fefab5107b861e4c4600700'
* commit '5f90ad99bb7e53383fefab5107b861e4c4600700':
  spherical: Change types of bounding and pad to uint32_t

This commit is a noop, see f20bcec4c2

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 18:46:28 -03:00
James Almer
572b7a0b85 Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc'
* commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc':
  lavu: Drop deprecated av_dlog macro

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 18:20:07 -03:00
James Almer
c0cfc0ce11 Merge commit '619a433eca2c5655c41b799e0b06380020fb1498'
* commit '619a433eca2c5655c41b799e0b06380020fb1498':
  lavu: Drop deprecated option type

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 18:18:00 -03:00
James Almer
b773a8d8c1 Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'
* commit 'dd343fd986459f467a2d1d70c26101dff1d47d68':
  lavu: Drop deprecated VDPAU pixel formats

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 18:15:49 -03:00
Mateusz
f192f2f061 swscale: more accurate DITHER_COPY macro for full and limited range
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-23 23:00:05 +02:00
James Almer
c17f638565 Merge commit '0648dec19db83bc8c87814d195e32cbad5698a40'
* commit '0648dec19db83bc8c87814d195e32cbad5698a40':
  lavc: Drop deprecated stream codec tag

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 17:24:34 -03:00
James Almer
bfab430856 Merge commit '94eed68ace9f2416af8457fcbf142b175928c06b'
* commit '94eed68ace9f2416af8457fcbf142b175928c06b':
  lavc: Drop deprecated options moved to private contexts

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 17:08:32 -03:00
James Almer
fb41bad7e0 avodec/vaapi: drop deprecated vaapi_context fields
Deprecated in 07/2015.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-23 17:00:06 -03:00
James Almer
3e0a16f003 Merge commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9'
* commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9':
  lavc: Drop deprecated time_base variable for decoding

This commit is a noop. The API has been postponed.

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 16:56:18 -03:00
James Almer
eb5f846339 avcodec: drop deprecated vismv option
Deprecated in 08/2014.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-23 16:52:24 -03:00
James Almer
d2484639bc Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'
* commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3':
  lavc: Drop deprecated way of setting audio delay on encode

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 16:38:04 -03:00
James Almer
2ccd00dabd Merge commit '5182a28b5de060c51c21b36053ab205bfbbbbe31'
* commit '5182a28b5de060c51c21b36053ab205bfbbbbe31':
  lavc: Drop deprecated global afd field

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 16:31:50 -03:00
James Almer
5a2e581879 Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704'
* commit '4476027d93680cd88d2f75ef1cef5b0c276a8704':
  lavc: Drop deprecated avctx codec name

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 16:28:38 -03:00
James Almer
b79a7da36f Merge commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940'
* commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940':
  lavc: Drop deprecated codec flags

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 16:19:38 -03:00
James Almer
6e69525e69 Merge commit '302554835e39b79b977ed60c9afe81b44590dfef'
* commit '302554835e39b79b977ed60c9afe81b44590dfef':
  lavc: Drop deprecated unused public members

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 16:08:42 -03:00
James Almer
7b550c5f84 Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'
* commit 'b3739599bda740ac12d3dde31a331b744df99123':
  lavc: Drop deprecated emu edge functionality

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 16:04:31 -03:00
James Almer
d658e04337 Merge commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859'
* commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859':
  lavc: Drop deprecated av_fast_malloc() compatibility

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 16:00:30 -03:00
James Almer
f7eb1c9ac5 Merge commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db'
* commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db':
  lavc: Drop deprecated macroblock type symbols

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 15:59:02 -03:00
James Almer
0b79fdeb9a Merge commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c'
* commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c':
  lavc: Drop deprecated public symbols

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 15:56:29 -03:00
James Almer
400ecd8e40 Merge commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc'
* commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc':
  lavc: Drop deprecated error rate option

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 15:50:46 -03:00
James Almer
7bbe33b052 avcodec/libx264: add me_method alias to set X264Context->motion_est
Replaces the now dropped global option.

Addresses ticket #6771.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-23 15:36:36 -03:00
James Almer
b46613dd9b Merge commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198'
* commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198':
  lavc: Remove deprecated XvMC support hacks

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 15:20:49 -03:00
James Almer
c381f6a483 Merge commit '0871e2337777d9161e7f3554bcad19dabc9e15e1'
* commit '0871e2337777d9161e7f3554bcad19dabc9e15e1':
  lavc: Drop deprecated architectures symbols

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 15:05:12 -03:00
James Almer
b13e61d629 Merge commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458'
* commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458':
  lavc: Drop deprecated extended aspect ratio symbol

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 15:02:25 -03:00
James Almer
51b88c3d4e Merge commit '0c7986df444273b0e53d3992ba9cc1108bd6a386'
* commit '0c7986df444273b0e53d3992ba9cc1108bd6a386':
  lavc: Drop deprecated workaround bugs options

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 14:59:23 -03:00
James Almer
d8a124e7eb Merge commit '8933ac2079644fb09916f1875c569103aefe84b1'
* commit '8933ac2079644fb09916f1875c569103aefe84b1':
  lavc: Drop deprecated debug mv functionality

This commit is a noop. A discussion is currently ongoing about the
removal of this feature.

Merged-by: James Almer <jamrial@gmail.com>
2017-10-23 14:55:48 -03:00
James Almer
8c2b829123 avutil/frame: remove unneccessary metadata pointer getter
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-23 10:58:00 -03:00
Martin Storsjö
f1fd12ef85 lavu/arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp
This was missed in e754c8e8 / e2710e790c since those functions
weren't exercised by checkasm.

Fixes ticket #6766.
2017-10-23 13:29:12 +02:00
Michael Niedermayer
2c9fa4162b ffmpeg: add -bitexact flag to simplify enabling bitexact mode in (de)muxer and (de/en)coder
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-23 12:41:04 +02:00