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

88183 Commits

Author SHA1 Message Date
James Almer
7066a92f87 Merge commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5'
* commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5':
  decode: Initialize ret before using it
  filtfmts-test: Mark filter as const

This commit is a noop, see
3c14547eb7
960b4d4761

Merged-by: James Almer <jamrial@gmail.com>
2017-10-26 16:51:03 -03:00
James Almer
99ba85a0e2 Merge commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436'
* commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436':
  lavfi: Drop unused and empty header file

Merged-by: James Almer <jamrial@gmail.com>
2017-10-26 16:46:11 -03:00
James Almer
ce9e07e6b6 Merge commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb'
* commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb':
  matroska: Read only the data written in the scratch buffer

This commit is a noop, see fd59207c1c

Merged-by: James Almer <jamrial@gmail.com>
2017-10-26 16:40:05 -03:00
James Almer
af0505ed95 Merge commit '6ac0e7818399a57e4684202bac79f35b3561ad1e'
* commit '6ac0e7818399a57e4684202bac79f35b3561ad1e':
  mpeg4videodec: raise an error if sprite_trajectory.table is NULL

Merged-by: James Almer <jamrial@gmail.com>
2017-10-26 16:19:43 -03:00
James Almer
cdba33c45f Merge commit 'b62ed6873821c8fce8f7e2c2927ae54f86afeb22'
* commit 'b62ed6873821c8fce8f7e2c2927ae54f86afeb22':
  configure: Better names for functions that sanitize input

Merged-by: James Almer <jamrial@gmail.com>
2017-10-26 16:14:54 -03:00
James Almer
c64800e976 configure: add optional zlib dependency to avformat
id3v2 code is compiled unconditionally and uses zlib when available.

Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-26 15:29:49 -03:00
James Almer
4bb09bf5a0 Merge commit '604fbb3132e88727e496c96c92cfe02748c25a1a'
* commit '604fbb3132e88727e496c96c92cfe02748c25a1a':
  mov: Move code shared with CAF to a separate file

Merged-by: James Almer <jamrial@gmail.com>
2017-10-26 15:21:59 -03:00
James Almer
4576ee100b Merge commit '3d197514e613ccd9eab43180c0a7c8b09a307606'
* commit '3d197514e613ccd9eab43180c0a7c8b09a307606':
  qsvenc: Allow use of hw_device_ctx to make the internal session
  qsvdec: Allow use of hw_device_ctx to make the internal session
  qsv: Add ability to create a session from a device
  doc: Add VAAPI encoders
  vaapi_encode: Add VP9 support
  vp9: Add bsf to fix reordering in raw streams

This commit is a noop, see
49419925d3
bde0460406
dc81f1a2ce
91c3b50d74
8aa3c2df1a
28aedeed19

Merged-by: James Almer <jamrial@gmail.com>
2017-10-26 14:46:31 -03:00
James Almer
4c0426c478 Merge commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4'
* commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4':
  vp9: Add bsf to merge superframes

[14:25:37] <@BBB> the functional change is wrong
[14:25:48] <@BBB> it allows recusrively packing superframes in superframes
[14:26:37] <@BBB> so I would ignore the remainder

See 2e6636aa87

Merged-by: James Almer <jamrial@gmail.com>
2017-10-26 14:39:28 -03:00
James Almer
b848eb8347 Merge commit 'f64d1100a54d12c78ce436181bb64229c56da6b3'
* commit 'f64d1100a54d12c78ce436181bb64229c56da6b3':
  avconv: Flush output BSFs when encode reaches EOF
  vf_deinterlace_vaapi: Add support for field rate output
  pthread_frame: Propagate sw_pix_fmt across threads

This commit is a noop, see
ebce133228
bff7bec1d7
bc4e33ce0f

Merged-by: James Almer <jamrial@gmail.com>
2017-10-26 14:11:45 -03:00
James Almer
5de85c1029 Merge commit '10f4511f14a4e830c0ed471df4cd1cc2a18a481a'
* commit '10f4511f14a4e830c0ed471df4cd1cc2a18a481a':
  libavutil: Make LOCAL_ALIGNED(xx be equal to LOCAL_ALIGNED_xx(

Also added LOCAL_ALIGNED_4 as it's used in vp8 decoder, and
simplified the configure defines.

Merged-by: James Almer <jamrial@gmail.com>
2017-10-26 14:06:34 -03:00
Mateusz
a4743d2574 avformat/yuv4mpeg: add gray9/10/12 support
Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl>
2017-10-26 18:32:28 +02:00
Carl Eugen Hoyos
f2c867051c lavc/avcodec: Constify the return value of av_bitstream_filter_next().
Fixes the following gcc warning:
libavcodec/bitstream_filter.c:39:12: warning: return discards 'const' qualifier from pointer target type
2017-10-26 18:29:02 +02:00
Tobias Rapp
a07ac93023 avformat/wavenc: skip writing incorrect peak-of-peaks position value
According to EBU tech 3285 supplement 3 the dwPosPeakOfPeaks field
should contain the absolute position to the maximum audio sample value,
but the current implementation writes the relative peak frame index
instead.

Fix the issue by writing the "unknown" value (-1) for now until the
feature is implemented correctly.

Previous version reviewed-by: Peter Bubestinger <p.bubestinger@av-rd.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
2017-10-26 08:29:41 +02:00
James Almer
ae100046ca avcodec/exif: remove GetByteContext usage from avpriv_exif_decode_ifd()
This prevents potential ABI issues with GetByteContext.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-26 00:45:49 -03:00
James Almer
6bd665b7c5 avcodec/tak: remove GetBitContext usage from avpriv_tak_parse_streaminfo()
This prevents potential ABI issues with GetBitContext.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2017-10-26 00:26:08 -03:00
Zhong Li
984b882b76 fate: fix mpeg2-ticket6677 faillures on some platforms
Signed-off-by: Zhong Li <zhong.li@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-26 01:47:52 +02:00
Mateusz
50ce296026 swscale: use dithering in DITHER_COPY only if not set -sws_dither none
This patch uses dithering in DITHER_COPY macro only if
it was not used option '-sws_dither none'.
With option '-sws_dither none' it uses downshift.

For human eye dithering is OK, for video codecs not necessarily.
If user don't want to use dithering, we should respect that.

Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 21:50:37 +02:00
Kaustubh Raste
736a48901f avcodec/mips: Improve hevc bi weighted hv mc msa functions
Use immediate unsigned saturation for clip to max saving one vector register.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 21:50:37 +02:00
Kaustubh Raste
ce0a52e9e9 avcodec/mips: Improve avc chroma copy and avg vert mc msa functions
Replace generic with block size specific function.
Load the specific destination bytes instead of MSA load and pack.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 21:50:37 +02:00
Kaustubh Raste
2aab7c2dfa avcodec/mips: Improve avc put mc 11, 31, 13 and 33 msa functions
Remove loops and unroll as block sizes are known.

Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com>
Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 21:50:37 +02:00
Michael Niedermayer
c23209f63d tools/target_dec_fuzzer: Fix build after AV_CODEC_CAP_HWACCEL_VDPAU was removed
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 21:50:37 +02:00
Michael Niedermayer
e6debcaaed tools/target_dec_fuzzer: Fix build after FF_INPUT_BUFFER_PADDING_SIZE was removed
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 21:50:37 +02:00
Dale Curtis
50e30d9bb7 Don't use _tzcnt instrinics with clang for windows w/o BMI.
Technically _tzcnt* intrinsics are only available when the BMI
instruction set is present. However the instruction encoding
degrades to "rep bsf" on older processors.

Clang for Windows debatably restricts the _tzcnt* instrinics behind
the __BMI__ architecture define, so check for its presence or
exclude the usage of these intrinics when clang is present.

See also:
https://ffmpeg.org/pipermail/ffmpeg-devel/2015-November/183404.html
https://bugs.llvm.org/show_bug.cgi?id=30506
http://lists.llvm.org/pipermail/cfe-dev/2016-October/051034.html

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 21:50:37 +02:00
James Almer
953d55f443 Merge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'
* commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b':
  hevc: Avoid using LOCAL_ALIGNED for 4 byte alignment

Merged-by: James Almer <jamrial@gmail.com>
2017-10-24 19:26:29 -03:00
James Almer
d289f3febd Merge commit '163cc67beb3ed28aeb500c9a09df47c8df613025'
* commit '163cc67beb3ed28aeb500c9a09df47c8df613025':
  takdec: Use ISO C printf conversion specifiers where appropriate
  dcadec: remove extra indirection
  hevcdec: Use LOCAL_ALIGNED_* for declaring local variables with alignment
  arm: Always build the hevcdsp_init_arm.c file

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2017-10-24 19:25:05 -03:00
Zhong Li
7e294a1f09 fate: add a test for mpeg2 issue of ticket #6677
Signed-off-by: Zhong Li <zhong.li@intel.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-25 00:18:41 +02:00
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