ffmpeg.git
19 months agofate: fix ffmpeg-attached_pics test dependencies
Marton Balint [Fri, 27 Oct 2017 00:42:25 +0000 (02:42 +0200)]
fate: fix ffmpeg-attached_pics test dependencies

Signed-off-by: Marton Balint <cus@passwd.hu>
19 months agoflvdec: Check the avio_seek return value after reading a metadata packet
Martin Storsjö [Fri, 27 Oct 2017 00:27:43 +0000 (08:27 +0800)]
flvdec: Check the avio_seek return value after reading a  metadata packet

merge from libav: 585dc1aecef0371ad6f16cb3750ae2a6da9cf00a

If the metadata packet is corrupted, flv_read_metabody can accidentally
read past the start of the next packet. If the start of the  next packet
had been flushed out of the IO buffer, we would be unable to seek to
the right position (on a nonseekable stream).

Prefer to clearly error out instead of silently  trying to read from a
desynced stream which will only be interpreted as garbage.

19 months agoRevert "flvdec: Check the avio_seek return value after reading a metadata packet"
Steven Liu [Fri, 27 Oct 2017 00:26:11 +0000 (08:26 +0800)]
Revert "flvdec: Check the avio_seek return value after reading a  metadata packet"

This reverts commit ef7fe81b8554a2865d47a55edf47420878fa3d91.

19 months agofate: add fate test for ticket #6375
Marton Balint [Sun, 8 Oct 2017 13:27:50 +0000 (15:27 +0200)]
fate: add fate test for ticket #6375

Signed-off-by: Marton Balint <cus@passwd.hu>
19 months agofate: add fate test for ticket #6603
Marton Balint [Sun, 8 Oct 2017 12:51:03 +0000 (14:51 +0200)]
fate: add fate test for ticket #6603

Signed-off-by: Marton Balint <cus@passwd.hu>
19 months agolavf: Remove AVFMT_RAWPICTURE.
Carl Eugen Hoyos [Thu, 26 Oct 2017 21:43:11 +0000 (23:43 +0200)]
lavf: Remove AVFMT_RAWPICTURE.

Deprecated since October 2015.

19 months agoMerge commit '193b09189004ede4a6998e69192d1a9f63602088'
James Almer [Thu, 26 Oct 2017 20:13:14 +0000 (17:13 -0300)]
Merge commit '193b09189004ede4a6998e69192d1a9f63602088'

* commit '193b09189004ede4a6998e69192d1a9f63602088':
  thread: Define ff_mutex_* macros as stub functions when threads are disabled

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'b200a2c8da403b5a5c8b50f8cb4a75fd4f0131b1'
James Almer [Thu, 26 Oct 2017 19:58:39 +0000 (16:58 -0300)]
Merge commit 'b200a2c8da403b5a5c8b50f8cb4a75fd4f0131b1'

* commit 'b200a2c8da403b5a5c8b50f8cb4a75fd4f0131b1':
  examples: Fixed and extended Doxygen documentation

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5'
James Almer [Thu, 26 Oct 2017 19:51:03 +0000 (16:51 -0300)]
Merge commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5'

* commit 'efddf2c09aed7400c73ecf327f86a4d0452b94b5':
  decode: Initialize ret before using it
  filtfmts-test: Mark filter as const

This commit is a noop, see
3c14547eb75c5b18099060085d12f09518ee2732
960b4d47612ec89cfdf0ff8b83bc7424ad4c754a

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436'
James Almer [Thu, 26 Oct 2017 19:46:11 +0000 (16:46 -0300)]
Merge commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436'

* commit 'f5950b8fd61ec85e0ad8790bea56b37ceea19436':
  lavfi: Drop unused and empty header file

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb'
James Almer [Thu, 26 Oct 2017 19:40:05 +0000 (16:40 -0300)]
Merge commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb'

* commit 'd32d59bc977b43031007bb2ab21e232f96d2ebcb':
  matroska: Read only the data written in the scratch buffer

This commit is a noop, see fd59207c1c86c6a76059b3565d340da9f8f47530

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '6ac0e7818399a57e4684202bac79f35b3561ad1e'
James Almer [Thu, 26 Oct 2017 19:19:43 +0000 (16:19 -0300)]
Merge commit '6ac0e7818399a57e4684202bac79f35b3561ad1e'

* commit '6ac0e7818399a57e4684202bac79f35b3561ad1e':
  mpeg4videodec: raise an error if sprite_trajectory.table is NULL

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'b62ed6873821c8fce8f7e2c2927ae54f86afeb22'
James Almer [Thu, 26 Oct 2017 19:14:54 +0000 (16:14 -0300)]
Merge commit 'b62ed6873821c8fce8f7e2c2927ae54f86afeb22'

* commit 'b62ed6873821c8fce8f7e2c2927ae54f86afeb22':
  configure: Better names for functions that sanitize input

Merged-by: James Almer <jamrial@gmail.com>
19 months agoconfigure: add optional zlib dependency to avformat
James Almer [Thu, 26 Oct 2017 18:27:57 +0000 (15:27 -0300)]
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>
19 months agoMerge commit '604fbb3132e88727e496c96c92cfe02748c25a1a'
James Almer [Thu, 26 Oct 2017 17:50:36 +0000 (14:50 -0300)]
Merge commit '604fbb3132e88727e496c96c92cfe02748c25a1a'

* commit '604fbb3132e88727e496c96c92cfe02748c25a1a':
  mov: Move code shared with CAF to a separate file

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '3d197514e613ccd9eab43180c0a7c8b09a307606'
James Almer [Thu, 26 Oct 2017 17:45:36 +0000 (14:45 -0300)]
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
49419925d33304ff907075289808226a695ff57b
bde04604065db565373c315ad13d9c3c5db4d7c9
dc81f1a2cef11538401ee1ca13b76e61838283e6
91c3b50d74ba8874ea090c29063f953f4cc90ba9
8aa3c2df1ae64b4b30462cc8a164520e65312d1a
28aedeed1961392d6b27f2f3abe4fd4c33393b93

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4'
James Almer [Thu, 26 Oct 2017 17:38:14 +0000 (14:38 -0300)]
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 2e6636aa87303d37b112e79f093ca39500f92364

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'f64d1100a54d12c78ce436181bb64229c56da6b3'
James Almer [Thu, 26 Oct 2017 17:11:45 +0000 (14:11 -0300)]
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
ebce1332285b16418dacb369defcfd7bae06d319
bff7bec1d7d0ed23f24a2c815f133d58b6b86b1e
bc4e33ce0f0ea797b28d02d02ff29778cbf975a4

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '10f4511f14a4e830c0ed471df4cd1cc2a18a481a'
James Almer [Thu, 26 Oct 2017 17:06:34 +0000 (14:06 -0300)]
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>
19 months agoavformat/yuv4mpeg: add gray9/10/12 support
Mateusz [Sat, 7 Oct 2017 17:05:53 +0000 (19:05 +0200)]
avformat/yuv4mpeg: add gray9/10/12 support

Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl>
19 months agolavc/avcodec: Constify the return value of av_bitstream_filter_next().
Carl Eugen Hoyos [Thu, 26 Oct 2017 16:29:02 +0000 (18:29 +0200)]
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

19 months agoavformat/wavenc: skip writing incorrect peak-of-peaks position value
Tobias Rapp [Fri, 29 Sep 2017 14:32:20 +0000 (16:32 +0200)]
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>
19 months agoavcodec/exif: remove GetByteContext usage from avpriv_exif_decode_ifd()
James Almer [Tue, 24 Oct 2017 02:39:54 +0000 (23:39 -0300)]
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>
19 months agoavcodec/tak: remove GetBitContext usage from avpriv_tak_parse_streaminfo()
James Almer [Sun, 22 Oct 2017 23:29:53 +0000 (20:29 -0300)]
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>
19 months agofate: fix mpeg2-ticket6677 faillures on some platforms
Zhong Li [Wed, 25 Oct 2017 05:45:22 +0000 (13:45 +0800)]
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>
19 months agoswscale: use dithering in DITHER_COPY only if not set -sws_dither none
Mateusz [Tue, 24 Oct 2017 08:02:17 +0000 (10:02 +0200)]
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>
19 months agoavcodec/mips: Improve hevc bi weighted hv mc msa functions
Kaustubh Raste [Tue, 24 Oct 2017 07:11:30 +0000 (12:41 +0530)]
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>
19 months agoavcodec/mips: Improve avc chroma copy and avg vert mc msa functions
Kaustubh Raste [Tue, 24 Oct 2017 07:10:42 +0000 (12:40 +0530)]
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>
19 months agoavcodec/mips: Improve avc put mc 11, 31, 13 and 33 msa functions
Kaustubh Raste [Tue, 24 Oct 2017 07:08:30 +0000 (12:38 +0530)]
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>
19 months agotools/target_dec_fuzzer: Fix build after AV_CODEC_CAP_HWACCEL_VDPAU was removed
Michael Niedermayer [Wed, 25 Oct 2017 17:27:29 +0000 (19:27 +0200)]
tools/target_dec_fuzzer: Fix build after AV_CODEC_CAP_HWACCEL_VDPAU was removed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agotools/target_dec_fuzzer: Fix build after FF_INPUT_BUFFER_PADDING_SIZE was removed
Michael Niedermayer [Wed, 25 Oct 2017 17:26:58 +0000 (19:26 +0200)]
tools/target_dec_fuzzer: Fix build after FF_INPUT_BUFFER_PADDING_SIZE was removed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoDon't use _tzcnt instrinics with clang for windows w/o BMI.
Dale Curtis [Tue, 24 Oct 2017 20:03:59 +0000 (13:03 -0700)]
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>
19 months agoMerge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'
James Almer [Tue, 24 Oct 2017 22:26:29 +0000 (19:26 -0300)]
Merge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b'

* commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b':
  hevc: Avoid using LOCAL_ALIGNED for 4 byte alignment

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '163cc67beb3ed28aeb500c9a09df47c8df613025'
James Almer [Tue, 24 Oct 2017 22:25:05 +0000 (19:25 -0300)]
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>
19 months agofate: add a test for mpeg2 issue of ticket #6677
Zhong Li [Mon, 23 Oct 2017 07:18:12 +0000 (15:18 +0800)]
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>
19 months agotests/ffserver.regression.ref: update checksums to what ffserver currently produces
Michael Niedermayer [Sun, 22 Oct 2017 15:11:21 +0000 (17:11 +0200)]
tests/ffserver.regression.ref: update checksums to what ffserver currently produces

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoffserver: Fix off by 1 error in path
Michael Niedermayer [Sun, 22 Oct 2017 15:11:20 +0000 (17:11 +0200)]
ffserver: Fix off by 1 error in path

Code suggested by ubitux

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agolibopus: Add channel mapping 2 support in libopusdec
Felicia Lim [Mon, 27 Mar 2017 23:21:20 +0000 (16:21 -0700)]
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>
19 months agoMerge commit '5a969f64b9cf40bad923c73b66c3031b0018e848'
James Almer [Tue, 24 Oct 2017 22:17:02 +0000 (19:17 -0300)]
Merge commit '5a969f64b9cf40bad923c73b66c3031b0018e848'

* commit '5a969f64b9cf40bad923c73b66c3031b0018e848':
  jack: Drop support for old (2012) JACK versions

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b'
James Almer [Tue, 24 Oct 2017 22:14:22 +0000 (19:14 -0300)]
Merge commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b'

* commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b':
  hwcontext: Move NONE to the be the first member of AVHWDeviceType

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '0b9a237b2386ff84a6f99716bd58fa27a1b767e7'
James Almer [Tue, 24 Oct 2017 22:10:22 +0000 (19:10 -0300)]
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>
19 months agocbs_h264: Fix format specifier
Mark Thompson [Tue, 24 Oct 2017 21:58:47 +0000 (22:58 +0100)]
cbs_h264: Fix format specifier

19 months agocbs_mpeg2: Fix format specifier
Mark Thompson [Tue, 24 Oct 2017 21:57:44 +0000 (22:57 +0100)]
cbs_mpeg2: Fix format specifier

19 months agocbs_mpeg2: Fix type for marker_bit reading
Mark Thompson [Tue, 24 Oct 2017 21:56:48 +0000 (22:56 +0100)]
cbs_mpeg2: Fix type for marker_bit reading

19 months agolavc/vaapi_encode_h264: correct VUI max_dec_frame_buffering setting
Jun Zhao [Tue, 24 Oct 2017 05:25:21 +0000 (13:25 +0800)]
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>
19 months agolavc/dvbsub: Add the missing line separator to dvb_encode_rle8().
Carl Eugen Hoyos [Tue, 24 Oct 2017 20:49:04 +0000 (22:49 +0200)]
lavc/dvbsub: Add the missing line separator to dvb_encode_rle8().

Fixes 256-colour dvb subtitle encoding.

Fixes ticket #6769.

19 months agolavc/dvbsub: Do not fail hard in the region block for 256-colour encoding.
JULIAN GARDNER [Tue, 24 Oct 2017 20:46:00 +0000 (22:46 +0200)]
lavc/dvbsub: Do not fail hard in the region block for 256-colour encoding.

Adds a hunk forgotten in 8a6799d2

19 months agolavfi/tests/filtfmts: Constify a variable.
Carl Eugen Hoyos [Tue, 24 Oct 2017 20:32:59 +0000 (22:32 +0200)]
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

19 months agoMerge commit '75ef91543422049a01b594925fcdb182ea12eb09'
James Almer [Mon, 23 Oct 2017 23:46:55 +0000 (20:46 -0300)]
Merge commit '75ef91543422049a01b594925fcdb182ea12eb09'

* commit '75ef91543422049a01b594925fcdb182ea12eb09':
  configure: Disable inline assembly for PathScale compilers

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'fe6eea99efac66839052af547426518efd970b24'
James Almer [Mon, 23 Oct 2017 22:58:04 +0000 (19:58 -0300)]
Merge commit 'fe6eea99efac66839052af547426518efd970b24'

* commit 'fe6eea99efac66839052af547426518efd970b24':
  nsvdec: don't ignore the return value of av_get_packet()

This commit is a noop, see
edf1cb7aeea0f8fe0e3e785648a30a7ed99defd0
8d7ce5cdb707d4b22749f72d3f118e62e2b95cd3

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1'
James Almer [Mon, 23 Oct 2017 22:54:45 +0000 (19:54 -0300)]
Merge commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1'

* commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1':
  rtmpproto: send swfverify value as swfurl if latter is unused

This commit is a noop, see c0b3781bf2fef529d64af0e36ea84c0a34522367

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd'
James Almer [Mon, 23 Oct 2017 22:42:23 +0000 (19:42 -0300)]
Merge commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd'

* commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd':
  configure: Skip check for inline assembly capabilities when explicitly disabled

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '083ea8768121ee800893e124b08483011b798919'
James Almer [Mon, 23 Oct 2017 22:17:31 +0000 (19:17 -0300)]
Merge commit '083ea8768121ee800893e124b08483011b798919'

* commit '083ea8768121ee800893e124b08483011b798919':
  APIchanges: Update bump dates

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24'
James Almer [Mon, 23 Oct 2017 22:14:20 +0000 (19:14 -0300)]
Merge commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24'

* commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24':
  avplay: Use the named syntax for buffersrc arguments

This commit is a noop, see 251f398798967380ce3fa3d1035e98c33e688338

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6'
James Almer [Mon, 23 Oct 2017 21:51:34 +0000 (18:51 -0300)]
Merge commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6'

* commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6':
  vf_showinfo: Display spherical properties

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe'
James Almer [Mon, 23 Oct 2017 21:49:22 +0000 (18:49 -0300)]
Merge commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe'

* commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe':
  vf_showinfo: Simplify reporting stereo3d information

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '5f90ad99bb7e53383fefab5107b861e4c4600700'
James Almer [Mon, 23 Oct 2017 21:46:28 +0000 (18:46 -0300)]
Merge commit '5f90ad99bb7e53383fefab5107b861e4c4600700'

* commit '5f90ad99bb7e53383fefab5107b861e4c4600700':
  spherical: Change types of bounding and pad to uint32_t

This commit is a noop, see f20bcec4c2b1c2a57ed89e5be1ac2e0db1bc62b4

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc'
James Almer [Mon, 23 Oct 2017 21:20:07 +0000 (18:20 -0300)]
Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc'

* commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc':
  lavu: Drop deprecated av_dlog macro

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '619a433eca2c5655c41b799e0b06380020fb1498'
James Almer [Mon, 23 Oct 2017 21:18:00 +0000 (18:18 -0300)]
Merge commit '619a433eca2c5655c41b799e0b06380020fb1498'

* commit '619a433eca2c5655c41b799e0b06380020fb1498':
  lavu: Drop deprecated option type

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'
James Almer [Mon, 23 Oct 2017 21:15:49 +0000 (18:15 -0300)]
Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68'

* commit 'dd343fd986459f467a2d1d70c26101dff1d47d68':
  lavu: Drop deprecated VDPAU pixel formats

Merged-by: James Almer <jamrial@gmail.com>
19 months agoswscale: more accurate DITHER_COPY macro for full and limited range
Mateusz [Fri, 6 Oct 2017 14:49:54 +0000 (16:49 +0200)]
swscale: more accurate DITHER_COPY macro for full and limited range

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agoMerge commit '0648dec19db83bc8c87814d195e32cbad5698a40'
James Almer [Mon, 23 Oct 2017 20:23:43 +0000 (17:23 -0300)]
Merge commit '0648dec19db83bc8c87814d195e32cbad5698a40'

* commit '0648dec19db83bc8c87814d195e32cbad5698a40':
  lavc: Drop deprecated stream codec tag

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '94eed68ace9f2416af8457fcbf142b175928c06b'
James Almer [Mon, 23 Oct 2017 20:06:05 +0000 (17:06 -0300)]
Merge commit '94eed68ace9f2416af8457fcbf142b175928c06b'

* commit '94eed68ace9f2416af8457fcbf142b175928c06b':
  lavc: Drop deprecated options moved to private contexts

Merged-by: James Almer <jamrial@gmail.com>
19 months agoavodec/vaapi: drop deprecated vaapi_context fields
James Almer [Mon, 23 Oct 2017 20:00:06 +0000 (17:00 -0300)]
avodec/vaapi: drop deprecated vaapi_context fields

Deprecated in 07/2015.

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9'
James Almer [Mon, 23 Oct 2017 19:56:18 +0000 (16:56 -0300)]
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>
19 months agoavcodec: drop deprecated vismv option
James Almer [Mon, 23 Oct 2017 19:52:24 +0000 (16:52 -0300)]
avcodec: drop deprecated vismv option

Deprecated in 08/2014.

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'
James Almer [Mon, 23 Oct 2017 19:37:30 +0000 (16:37 -0300)]
Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3'

* commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3':
  lavc: Drop deprecated way of setting audio delay on encode

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '5182a28b5de060c51c21b36053ab205bfbbbbe31'
James Almer [Mon, 23 Oct 2017 19:31:50 +0000 (16:31 -0300)]
Merge commit '5182a28b5de060c51c21b36053ab205bfbbbbe31'

* commit '5182a28b5de060c51c21b36053ab205bfbbbbe31':
  lavc: Drop deprecated global afd field

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704'
James Almer [Mon, 23 Oct 2017 19:28:38 +0000 (16:28 -0300)]
Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704'

* commit '4476027d93680cd88d2f75ef1cef5b0c276a8704':
  lavc: Drop deprecated avctx codec name

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940'
James Almer [Mon, 23 Oct 2017 19:19:38 +0000 (16:19 -0300)]
Merge commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940'

* commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940':
  lavc: Drop deprecated codec flags

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '302554835e39b79b977ed60c9afe81b44590dfef'
James Almer [Mon, 23 Oct 2017 19:08:42 +0000 (16:08 -0300)]
Merge commit '302554835e39b79b977ed60c9afe81b44590dfef'

* commit '302554835e39b79b977ed60c9afe81b44590dfef':
  lavc: Drop deprecated unused public members

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'b3739599bda740ac12d3dde31a331b744df99123'
James Almer [Mon, 23 Oct 2017 19:04:31 +0000 (16:04 -0300)]
Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'

* commit 'b3739599bda740ac12d3dde31a331b744df99123':
  lavc: Drop deprecated emu edge functionality

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859'
James Almer [Mon, 23 Oct 2017 19:00:30 +0000 (16:00 -0300)]
Merge commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859'

* commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859':
  lavc: Drop deprecated av_fast_malloc() compatibility

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db'
James Almer [Mon, 23 Oct 2017 18:59:02 +0000 (15:59 -0300)]
Merge commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db'

* commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db':
  lavc: Drop deprecated macroblock type symbols

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c'
James Almer [Mon, 23 Oct 2017 18:56:29 +0000 (15:56 -0300)]
Merge commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c'

* commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c':
  lavc: Drop deprecated public symbols

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc'
James Almer [Mon, 23 Oct 2017 18:50:46 +0000 (15:50 -0300)]
Merge commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc'

* commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc':
  lavc: Drop deprecated error rate option

Merged-by: James Almer <jamrial@gmail.com>
19 months agoavcodec/libx264: add me_method alias to set X264Context->motion_est
James Almer [Mon, 23 Oct 2017 17:34:15 +0000 (14:34 -0300)]
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>
19 months agoMerge commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198'
James Almer [Mon, 23 Oct 2017 18:11:42 +0000 (15:11 -0300)]
Merge commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198'

* commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198':
  lavc: Remove deprecated XvMC support hacks

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '0871e2337777d9161e7f3554bcad19dabc9e15e1'
James Almer [Mon, 23 Oct 2017 18:04:19 +0000 (15:04 -0300)]
Merge commit '0871e2337777d9161e7f3554bcad19dabc9e15e1'

* commit '0871e2337777d9161e7f3554bcad19dabc9e15e1':
  lavc: Drop deprecated architectures symbols

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458'
James Almer [Mon, 23 Oct 2017 18:02:25 +0000 (15:02 -0300)]
Merge commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458'

* commit 'c06e73929199c4bdbb32ffb3d81c27ea57dd1458':
  lavc: Drop deprecated extended aspect ratio symbol

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '0c7986df444273b0e53d3992ba9cc1108bd6a386'
James Almer [Mon, 23 Oct 2017 17:59:23 +0000 (14:59 -0300)]
Merge commit '0c7986df444273b0e53d3992ba9cc1108bd6a386'

* commit '0c7986df444273b0e53d3992ba9cc1108bd6a386':
  lavc: Drop deprecated workaround bugs options

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '8933ac2079644fb09916f1875c569103aefe84b1'
James Almer [Mon, 23 Oct 2017 17:55:48 +0000 (14:55 -0300)]
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>
19 months agoavutil/frame: remove unneccessary metadata pointer getter
James Almer [Mon, 23 Oct 2017 13:58:00 +0000 (10:58 -0300)]
avutil/frame: remove unneccessary metadata pointer getter

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agolavu/arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp
Martin Storsjö [Mon, 23 Oct 2017 07:48:02 +0000 (10:48 +0300)]
lavu/arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp

This was missed in e754c8e8 / e2710e790c0 since those functions
weren't exercised by checkasm.

Fixes ticket #6766.

19 months agoffmpeg: add -bitexact flag to simplify enabling bitexact mode in (de)muxer and (de...
Michael Niedermayer [Sat, 21 Oct 2017 23:41:57 +0000 (01:41 +0200)]
ffmpeg: add -bitexact flag to simplify enabling bitexact mode in (de)muxer and (de/en)coder

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agomov: fix decode of fragments that overlap in time
John Stebbins [Thu, 12 Oct 2017 17:59:23 +0000 (10:59 -0700)]
mov: fix decode of fragments that overlap in time

When keyframe intervals of dash segments are not perfectly aligned,
fragments in the stream can overlap in time. The previous sorting by
timestamp causes packets to be read out of decode order and results
in decode errors.

Insert new "trun" index entries into index_entries in the order that
the trun are referenced by the sidx.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
19 months agolavc: drop VDA
Clément Bœsch [Tue, 5 Sep 2017 13:58:13 +0000 (15:58 +0200)]
lavc: drop VDA

Deprecated (aka removed) in OSX 10.11, and we have a replacement for it
(VideoToolbox).

19 months agolavf/avio: Print the https warning also for missing tls protocol.
Carl Eugen Hoyos [Sat, 21 Oct 2017 23:11:55 +0000 (01:11 +0200)]
lavf/avio: Print the https warning also for missing tls protocol.

19 months agoavcodec/tak: make buf const in avpriv_dca_parse_core_frame_header()
James Almer [Sun, 22 Oct 2017 23:51:31 +0000 (20:51 -0300)]
avcodec/tak: make buf const in avpriv_dca_parse_core_frame_header()

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoavutil/tests/hmac: remove superfluous loop
James Almer [Sun, 22 Oct 2017 23:25:38 +0000 (20:25 -0300)]
avutil/tests/hmac: remove superfluous loop

The gap in enum values has been removed.

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoavutil/hmac: remove gap in AVHMACType enum values
James Almer [Sun, 22 Oct 2017 22:47:05 +0000 (19:47 -0300)]
avutil/hmac: remove gap in AVHMACType enum values

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agolavc/bitstream_filter: Make a cast explicit.
Carl Eugen Hoyos [Wed, 1 Mar 2017 22:35:14 +0000 (23:35 +0100)]
lavc/bitstream_filter: Make a cast explicit.

Fixes the following gcc warning:
libavcodec/bitstream_filter.c:133:14: warning: assignment discards ‘const’ qualifier from pointer target type

19 months agoavcodec/libavcodec.v: remove obsolete exports
James Almer [Sun, 22 Oct 2017 13:12:52 +0000 (10:12 -0300)]
avcodec/libavcodec.v: remove obsolete exports

Forgotten cruft that should have been removed in
8f483108b503fa03ed5e956e25df4cb899171df5.

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoavformat: remove dead av_stream_get_side_data() cruft
James Almer [Sun, 22 Oct 2017 04:36:28 +0000 (01:36 -0300)]
avformat: remove dead av_stream_get_side_data() cruft

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoavformat: remove ABI portion of the side data merging API
James Almer [Sun, 22 Oct 2017 04:29:41 +0000 (01:29 -0300)]
avformat: remove ABI portion of the side data merging API

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoavutil/crc: remove gap in AVCRCId enum values
James Almer [Sun, 22 Oct 2017 03:44:55 +0000 (00:44 -0300)]
avutil/crc: remove gap in AVCRCId enum values

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agopostproc: Drop deprecated qp typedef
James Almer [Sun, 22 Oct 2017 03:35:23 +0000 (00:35 -0300)]
postproc: Drop deprecated qp typedef

Deprecated in 08/2015.

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoavcodec: remove ABI portion of the side data merging API
James Almer [Sun, 22 Oct 2017 03:30:12 +0000 (00:30 -0300)]
avcodec: remove ABI portion of the side data merging API

The actual API is left in place until the deprecation period ends.

Signed-off-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81'
James Almer [Sun, 22 Oct 2017 02:59:53 +0000 (23:59 -0300)]
Merge commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81'

* commit '6dca24cd1d570b806b5a3fdaef9d3c8608942a81':
  lavc: Drop deprecated way of setting codec dimensions

Merged-by: James Almer <jamrial@gmail.com>
19 months agoMerge commit '1146bb3babca3973e88005d267cd06210d6ac075'
James Almer [Sun, 22 Oct 2017 02:56:51 +0000 (23:56 -0300)]
Merge commit '1146bb3babca3973e88005d267cd06210d6ac075'

* commit '1146bb3babca3973e88005d267cd06210d6ac075':
  lavc: Drop deprecated voxware codec entry

Merged-by: James Almer <jamrial@gmail.com>