ffmpeg.git
3 years agoUpdate for 3.1.2 n3.1.2
Michael Niedermayer [Mon, 8 Aug 2016 19:42:18 +0000 (21:42 +0200)]
Update for 3.1.2

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agocmdutils: remove the current working directory from the DLL search path on win32
Hendrik Leppkes [Mon, 8 Aug 2016 13:27:41 +0000 (15:27 +0200)]
cmdutils: remove the current working directory from the DLL search path on win32

Reviewed-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3bf142c77337814458ed8e036796934032d9837f)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/rawdec: Fix palette handling with changing palettes
Michael Niedermayer [Thu, 4 Aug 2016 10:26:41 +0000 (12:26 +0200)]
avcodec/rawdec: Fix palette handling with changing palettes

Fixes out of array access

Fixes: poc.swf
Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6aa39080ccea2b60433e920417844c3a3c0da50b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/raw: Fix decoding of ilacetest.mov
Michael Niedermayer [Sun, 7 Aug 2016 14:27:31 +0000 (16:27 +0200)]
avcodec/raw: Fix decoding of ilacetest.mov

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit bbec14de3126dbc4e1ec2b32ed714dab173386aa)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/mov: Enable mp3 parsing if a packet needs it
Michael Niedermayer [Sat, 16 Jul 2016 21:27:54 +0000 (23:27 +0200)]
avformat/mov: Enable mp3 parsing if a packet needs it

Fixes Ticket5689

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 803c058a6f0c835c3094621d03d6e8c02565f28e)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/hls: Use an array instead of stream offset for stream mapping
Anssi Hannula [Wed, 27 Jul 2016 20:29:16 +0000 (23:29 +0300)]
avformat/hls: Use an array instead of stream offset for stream mapping

This will be useful when the amount of streams per subdemuxer is not
known at hls_read_header time in a following commit.

(cherry picked from commit 9884f17e343b37aef442fafa05bd0113cdf47087)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/hls: Sync starting segment across variants on live streams
Anssi Hannula [Wed, 27 Jul 2016 19:52:44 +0000 (22:52 +0300)]
avformat/hls: Sync starting segment across variants on live streams

This will avoid a large time difference between variants in the most
common case.

(cherry picked from commit 4d85069e5dff37e4a9904767242b47e14cf62a9c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/hls: Fix regression with ranged media segments
Anssi Hannula [Tue, 26 Jul 2016 12:18:40 +0000 (15:18 +0300)]
avformat/hls: Fix regression with ranged media segments

Commit 81306fd4bdf ("hls: eliminate ffurl_* usage", merged in d0fc5de3a6)
changed the hls demuxer to use AVIOContext instead of URLContext for its
HTTP requests.

HLS demuxer uses the "offset" option of the http demuxer, requesting
the initial file offset for the I/O (http URLProtocol uses the "Range:"
HTTP header to try to accommodate that).

However, the code in libavformat/aviobuf.c seems to be doing its own
accounting for the current file offset (AVIOContext.pos), with the
assumption that the initial offset is always zero.

HLS demuxer does an explicit seek after open_url to account for cases
where the "offset" was not effective (due to the URL being a local file
or the HTTP server not obeying it), which should be a no-op in case the
file offset is already at that position.

However, since aviobuf.c code thinks the starting offset is 0, this
doesn't work properly.

This breaks retrieval of ranged media segments.

To fix the regression, just drop the seek call from the HLS demuxer when
the HTTP(S) protocol is used.

(cherry picked from commit 9cb30f7a880578e995becbd8bf9ffb69788e09a2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/ffv1enc: Fix assertion failure with non zero bits per sample
Michael Niedermayer [Fri, 5 Aug 2016 23:53:30 +0000 (01:53 +0200)]
avcodec/ffv1enc: Fix assertion failure with non zero bits per sample

Fixes Ticket5736
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c1bfeda5a34631787e07702f7a3569a41751caeb)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/af_hdcd: small fix in af_hdcd.c where gain was not being adjusted for "atten...
Burt P [Mon, 4 Jul 2016 19:16:54 +0000 (14:16 -0500)]
avfilter/af_hdcd: small fix in af_hdcd.c where gain was not being adjusted for "attenuate slowly"

Signed-off-by: Burt P <pburt0@gmail.com>
Taken from ba69a81019a2642969b108c39e3bea7d2f8ffbfa
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/oggdec: Fix integer overflow with invalid pts
Michael Niedermayer [Wed, 3 Aug 2016 11:34:40 +0000 (13:34 +0200)]
avformat/oggdec: Fix integer overflow with invalid pts

If negative pts are possible for some codecs in ogg then the code needs to be
changed to use signed values.

Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c5cc3b08e56fc95665977544486bd9f06e4b7a72)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffplay: Fix invalid array index
Michael Niedermayer [Wed, 3 Aug 2016 11:15:14 +0000 (13:15 +0200)]
ffplay: Fix invalid array index

Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 6cd9a8b67a95a136ea15bfe3c3bab6cf5e6d1cc9)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/alacenc: allocate bigger packets
Paul B Mahol [Fri, 29 Jul 2016 13:05:52 +0000 (15:05 +0200)]
avcodec/alacenc: allocate bigger packets
(cherry picked from commit 82b84c71b009884c8d041361027718b19922c76d)

3 years agolibavcodec/dnxhd: Enable 12-bit DNxHR support.
Steven Robertson [Tue, 2 Aug 2016 06:26:12 +0000 (23:26 -0700)]
libavcodec/dnxhd: Enable 12-bit DNxHR support.

10- and 12-bit DNxHR use the same DC coefficient decoding process and
VLC table, just with a different shift value. From SMPTE 2019-1:2016,
8.2.4 DC Coefficient Decoding:

"For 8-bit video sampling, the maximum value of η=11 and for
10-/12-bit video sampling, the maximum value of η=13."

A sample file will be uploaded to show that with this patch, things
decode correctly:
dnxhr_hqx_12bit_1080p_smpte_colorbars_davinci_resolve.mov

Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e1be80aa11cca765881d04f21119487db53c4ffa)

3 years agolavc/vaapi_encode_h26x: Fix a crash if "." is not the decimal separator.
Carl Eugen Hoyos [Tue, 2 Aug 2016 17:02:09 +0000 (19:02 +0200)]
lavc/vaapi_encode_h26x: Fix a crash if "." is not the decimal separator.

Fixes Debian bugs #831529, #831909, #832964.

Signed-off-by: Mark Thompson <sw@jkqxz.net>
(cherry picked from commit 82e53b3cef924f250f928fca6348204e2ace90d8)

3 years agojni: Return ENOSYS on unsupported platforms
Timothy Gu [Wed, 3 Aug 2016 03:47:55 +0000 (20:47 -0700)]
jni: Return ENOSYS on unsupported platforms

3 years agolavu/hwcontext_vaapi: Fix compilation if VA_FOURCC_ABGR is not defined.
Carl Eugen Hoyos [Tue, 2 Aug 2016 15:07:41 +0000 (17:07 +0200)]
lavu/hwcontext_vaapi: Fix compilation if VA_FOURCC_ABGR is not defined.

Fixes ticket #5484.
(cherry picked from commit 5aede051202150a1904c0f07a5c7901f402395a5)

3 years agoavcodec/vp9_parser: Check the input frame sizes for being consistent
Michael Niedermayer [Mon, 1 Aug 2016 11:50:21 +0000 (13:50 +0200)]
avcodec/vp9_parser: Check the input frame sizes for being consistent

Suggested-by: BBB
Fixed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 77b0f3f26d33d4f46f274896e0583ad1f5936b7c)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/flvdec: parse keyframe before a\v stream was created add_keyframes_index...
Xinzheng Zhang [Wed, 27 Jul 2016 04:21:25 +0000 (12:21 +0800)]
avformat/flvdec: parse keyframe before a\v stream was created add_keyframes_index() when stream created or keyframe parsed

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ad14aab3b4f88cdb6c2a3f8877c578e5a8042f1d)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/flvdec: splitting add_keyframes_index() out from parse_keyframes_index()
Xinzheng Zhang [Wed, 27 Jul 2016 04:21:24 +0000 (12:21 +0800)]
avformat/flvdec: splitting add_keyframes_index() out from parse_keyframes_index()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cd141e71bd3441ac9b7b720b934b7d4d85a75355)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavformat/rtpdec_asf: zero initialize the AVIOContext struct
Kacper Michajłow [Sat, 23 Jul 2016 21:47:39 +0000 (23:47 +0200)]
libavformat/rtpdec_asf: zero initialize the AVIOContext struct

This fixes crash in avformat_open_input() when accessing
protocol_whitelist field.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit e947b75b1c76ef6793209c2c445b8c224a28717a)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavutil/opt: Small bugfix in example.
Kacper Michajłow [Sat, 23 Jul 2016 19:43:06 +0000 (21:43 +0200)]
libavutil/opt: Small bugfix in example.

Fix const corectness and zero init the struct. This example code would actually crash when initializing string.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 69630f4d304a4e35d90957d6a170744af87cbf93)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibx264: Increase x264 opts character limit to 4096
Sasi Inguva [Fri, 22 Jul 2016 01:52:41 +0000 (18:52 -0700)]
libx264: Increase x264 opts character limit to 4096

Signed-off-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 282477bf4534439ecb06f14d46446a4f1ab82284)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/h264_parser: Set sps/pps_ref
Michael Niedermayer [Sat, 2 Jul 2016 01:06:27 +0000 (03:06 +0200)]
avcodec/h264_parser: Set sps/pps_ref

Fixes use of freed memory
Should fix valgrind failures of fate-h264-skip-nointra

Found-by: logan
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit febc862b53c090e530b943ebd873747addf5f913)

Conflicts:

libavcodec/h264_parser.c

3 years agolibrtmp: Avoid an infiniloop setting connection arguments
Luca Barbato [Wed, 22 Jun 2016 04:36:31 +0000 (06:36 +0200)]
librtmp: Avoid an infiniloop setting connection arguments

The exit condition was missing.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
(cherry picked from commit e85d38c20a8893cb59d7c86f74481f2497882196)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
3 years agoavformat/oggparsevp8: fix pts calculation on pages ending with an invisible frame
James Almer [Tue, 12 Jul 2016 20:05:42 +0000 (17:05 -0300)]
avformat/oggparsevp8: fix pts calculation on pages ending with an invisible frame

Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 5adfbd391847fcdaea1e9b105fae2dd90af2a733)

3 years agolavc/Makefile: Fix standalone compilation of the svq3 decoder.
Carl Eugen Hoyos [Sun, 24 Jul 2016 21:50:33 +0000 (23:50 +0200)]
lavc/Makefile: Fix standalone compilation of the svq3 decoder.

Regression since 0bf5fd2e
(cherry picked from commit 71167f7f8434341b3f76da68a10923b6525e2e87)

3 years agolavf/vplayerdec: Improve auto-detection.
Clément Bœsch [Fri, 15 Jul 2016 08:29:14 +0000 (10:29 +0200)]
lavf/vplayerdec: Improve auto-detection.

Fixes the incorrect detection of 16_selma_OneFrame_QP39.yuv (gray16le
rawvideo) as vplayer format.
(cherry picked from commit 77726d32a872ad500434fd8799b289cf56215047)

3 years agolavc/mediacodecdec_h264: properly convert extradata to annex-b
Matthieu Bouron [Sun, 3 Jul 2016 15:34:51 +0000 (17:34 +0200)]
lavc/mediacodecdec_h264: properly convert extradata to annex-b

H264ParamSets has its SPS/PPS stored raw (SODB) and needs to be
converted to NAL units before sending them to MediaCodec.

This patch adds the missing convertion of the SPS/PPS from SOBP to RBSP
which makes the resulting NAL units correct.

Fixes codec initialization on Nexus 4 and Nexus 7.

(cherry picked from commit 88d9c30cf57ec7328f16a241f10c84415e9aef4e)

3 years agoRevert "configure: Enable GCC vectorization on ≥4.9 on x86"
James Almer [Sat, 9 Jul 2016 19:00:06 +0000 (16:00 -0300)]
Revert "configure: Enable GCC vectorization on ≥4.9 on x86"

This reverts commit cb8646af24bd8e9627cc5e1c62b049a00fe0b07b.

This change has brough more issues than benefits, between compilation
time failures depending on flags used and code miscompilation causing
runtime crashes.

See the "[PATCH 2/2] configure: Enable GCC vectorization on ≥4.9"
thread in the ffmpeg-devel mailing list for the relevant discussion.

(cherry picked from commit fd6dbc53855fbfc9a782095d0ffe11dd3a98905f)

3 years agodoc/APIchanges: fill in missing git hash n3.1.1
Michael Niedermayer [Fri, 1 Jul 2016 00:42:03 +0000 (02:42 +0200)]
doc/APIchanges: fill in missing git hash

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2a8dadb38f6b458ffe3ac2037bace7c3892cb282)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoUpdate for 3.1.1
Michael Niedermayer [Fri, 1 Jul 2016 00:13:51 +0000 (02:13 +0200)]
Update for 3.1.1

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/APIchanges: document the lavu/lavf field moves
Michael Niedermayer [Thu, 30 Jun 2016 16:12:41 +0000 (18:12 +0200)]
doc/APIchanges: document the lavu/lavf field moves

Based-on: patch by James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 86fec7a7e861f0ad3c95cb27271267ec143ff754)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/avformat: Move new field to the end of AVStream
Michael Niedermayer [Thu, 30 Jun 2016 12:02:26 +0000 (14:02 +0200)]
avformat/avformat: Move new field to the end of AVStream

This fixes part of Ticket5676
This fixes kodi, mpv, chromium and ffplay build against 3.0 and linked to 3.1

This is a similar ABI fix to 1eb43af1a0e542ad83dcbf327197785d815fc42d

Approved-by: BBB
Approved-by: jamrial
Approved-by: BtbN
Approved-by: nevcairiel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c1c7e0abb0c513a5f35b29126175b99fc9ca0254)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/utils: update deprecated AVStream->codec when the context is updated
Hendrik Leppkes [Thu, 30 Jun 2016 12:10:42 +0000 (14:10 +0200)]
avformat/utils: update deprecated AVStream->codec when the context is updated

This ensures the AVStream->codec entry is kept in sync when new streams are
discovered mid-playback or changes to the context occur from other sources.

Fixes trac 5678.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit c2e13d2ecd388bab28e743c34ed146c5ed213fc9)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavutil/frame: Move new field to the end of AVFrame
Michael Niedermayer [Thu, 30 Jun 2016 12:02:27 +0000 (14:02 +0200)]
avutil/frame: Move new field to the end of AVFrame

This fixes part of Ticket5676
This fixes kodi, mpv, chromium and ffplay build against 3.0 and linked to 3.1

This is a similar ABI fix to 1eb43af1a0e542ad83dcbf327197785d815fc42d

Approved-by: BBB
Approved-by: jamrial
Approved-by: BtbN
Approved-by: nevcairiel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 042fb69deb5303d147b21ab1061387fb6e0c7afc)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavcodec/exr : fix decoding piz float file.
Martin Vignali [Tue, 28 Jun 2016 11:23:43 +0000 (13:23 +0200)]
libavcodec/exr : fix decoding piz float file.

fix ticket #5674

the size of data to process in piz_uncompress, is now calc
using the pixel type of each channel.

the data reorganization, alos take care about the size of
each channel

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit d9e1e08133234dc4501413f0e3211f3a268049bc)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/mov: Check sample size
Michael Niedermayer [Tue, 28 Jun 2016 21:49:36 +0000 (23:49 +0200)]
avformat/mov: Check sample size

Fixes integer overflow
Fixes: poc.mp4

Found-by: ajax secure <ajax4sec@hotmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 8a3221cc67a516dfc1700bdae3566ec52c7ee823)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavfi: Move new field to the end of AVFilterContext
Timo Rothenpieler [Wed, 29 Jun 2016 09:44:24 +0000 (11:44 +0200)]
lavfi: Move new field to the end of AVFilterContext

This fixes an accidental ABI break introduced at 8688d3a.

3 years agolavfi: Move new field to the end of AVFilterLink
Timo Rothenpieler [Wed, 29 Jun 2016 09:38:14 +0000 (11:38 +0200)]
lavfi: Move new field to the end of AVFilterLink

Even though this is not part of the public API, some external
applications access fields after it, thus breaking after updating from
ffmpeg 3.0 or earlier.
Since it is not public, it can be freely moved to the end to avoid
that problem in the future.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffplay: Fix usage of private lavfi API
Timo Rothenpieler [Wed, 29 Jun 2016 09:15:39 +0000 (11:15 +0200)]
ffplay: Fix usage of private lavfi API

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers
Matthieu Bouron [Tue, 28 Jun 2016 10:25:27 +0000 (12:25 +0200)]
lavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers

Fixes a regression introduced by 0cd5e281df3f69c1ed8f2a72a5bcbf9691e1b5d5.

(cherry picked from commit db0af7250a276700a349766c5412eb48ec630f0a)

3 years agolavc/pnm_parser: disable parsing for text based PNMs
Clément Bœsch [Mon, 27 Jun 2016 15:54:22 +0000 (17:54 +0200)]
lavc/pnm_parser: disable parsing for text based PNMs

P1, P2, and P3 are respectively the text versions of PBM, PGM and PPM
files.

We can not obtain the buffer size using av_imgage_get_buffer_size() as
every pixel in the picture will occupy a random size between 16 and 32
bits ("4 " and "231 " are such example).

Ideally, we could look for the next header (or EOF) in the bytestream,
but this commit is meant to fix a decoding regression introduced by
48ac4532d437790e56b8ed5d0d467dc88685f035.

Fix Ticket #5670

(cherry picked from commit c5566f0a944e376b39c8f994659060ca036c441d)

3 years agoChangelog: Add VideoToolbox encoder entry for 3.1
Rick Kern [Mon, 27 Jun 2016 15:43:13 +0000 (11:43 -0400)]
Changelog: Add VideoToolbox encoder entry for 3.1

Signed-off-by: Rick Kern <kernrj@gmail.com>
(cherry picked from commit d9561718135a6eba8c781fa248679d9280030a0c)

3 years agoconfigure: use c++98 for c++ files n3.1
Rick Kern [Sun, 26 Jun 2016 20:44:40 +0000 (16:44 -0400)]
configure: use c++98 for c++ files

Use c++98 standard instead of c++11.

Signed-off-by: Rick Kern <kernrj@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 729d82abae2f9bae3e5152022d2df0bb5bcde98e)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agochangelog: fix entry order
James Almer [Sun, 26 Jun 2016 18:27:47 +0000 (15:27 -0300)]
changelog: fix entry order

Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit c6f2d1a21f80ec4f2184c23fe399c2a222d34e24)

3 years agoUpdate FFmpeg 3.1 cut marker
James Almer [Sun, 26 Jun 2016 17:45:54 +0000 (14:45 -0300)]
Update FFmpeg 3.1 cut marker

Signed-off-by: James Almer <jamrial@gmail.com>
(cherry picked from commit 069fd69662a13eb6a2b3d0497232b841e8f1caf8)

3 years agoMerge branch 'master' into release/3.1
James Almer [Sun, 26 Jun 2016 18:14:17 +0000 (15:14 -0300)]
Merge branch 'master' into release/3.1

Merged-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/libopenjpegenc: Set numresolutions by default to a value that is not too...
Michael Niedermayer [Sun, 26 Jun 2016 15:34:37 +0000 (17:34 +0200)]
avcodec/libopenjpegenc: Set numresolutions by default to a value that is not too large

Fixes issues with libopenjpeg 2.1

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'
Hendrik Leppkes [Sun, 26 Jun 2016 13:53:00 +0000 (15:53 +0200)]
Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'

* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50':
  Drop unnecessary libavutil/x86/asm.h #includes

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '5264e7ba217b3c0ceae813917134e1ab52573141'
Hendrik Leppkes [Sun, 26 Jun 2016 13:45:21 +0000 (15:45 +0200)]
Merge commit '5264e7ba217b3c0ceae813917134e1ab52573141'

* commit '5264e7ba217b3c0ceae813917134e1ab52573141':
  ac3: Check the array bound before dereferencing

See d85ebea3f3b68ebccfe308fa839fc30fa634e4de

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84'
Hendrik Leppkes [Sun, 26 Jun 2016 13:44:43 +0000 (15:44 +0200)]
Merge commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84'

* commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84':
  vaapi_h264: Add trivial support for low-power encoding

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'
Hendrik Leppkes [Sun, 26 Jun 2016 13:44:35 +0000 (15:44 +0200)]
Merge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'

* commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b':
  vaapi_h264: Fix frame_num after non-reference frames

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32'
Hendrik Leppkes [Sun, 26 Jun 2016 13:44:25 +0000 (15:44 +0200)]
Merge commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32'

* commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32':
  vaapi_encode: Check config attributes before creating config

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '6641819feedb086ebba3d2be89b8d33980f367e1'
Hendrik Leppkes [Sun, 26 Jun 2016 13:43:05 +0000 (15:43 +0200)]
Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'

* commit '6641819feedb086ebba3d2be89b8d33980f367e1':
  build: Ignore generated mapfile and remove it on distclean

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'
Hendrik Leppkes [Sun, 26 Jun 2016 13:41:49 +0000 (15:41 +0200)]
Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'

* commit 'f5c43884190be094749acfba104e3eab98d8ff1e':
  FATE: drop the audio stream from the dxtory test

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e'
Hendrik Leppkes [Sun, 26 Jun 2016 13:39:06 +0000 (15:39 +0200)]
Merge commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e'

* commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e':
  avconv: fix parsing bitstream filters

Not merged because ffmpeg_opt.c still uses the old BSF API.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'
Hendrik Leppkes [Sun, 26 Jun 2016 13:37:34 +0000 (15:37 +0200)]
Merge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'

* commit '80fb19bc234a3f2350d891adf39f3738a8e4849f':
  avconv: fix a check for av_bsf_get_by_name() return value

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'
Hendrik Leppkes [Sun, 26 Jun 2016 13:36:27 +0000 (15:36 +0200)]
Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'

* commit '9f7590f4e497c12693247d7f935a20d7773a64dd':
  avconv_vaapi: use the hwcontext device creation API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agohwcontext_dxva2: Use GetDesktopWindow instead of GetShellWindow
Hendrik Leppkes [Sun, 26 Jun 2016 13:34:40 +0000 (15:34 +0200)]
hwcontext_dxva2: Use GetDesktopWindow instead of GetShellWindow

Improves compatibility with some MinGW variants,
see 771537edcf703434161c100e6898891546d1d4b3

3 years agoMerge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'
Hendrik Leppkes [Sun, 26 Jun 2016 13:34:01 +0000 (15:34 +0200)]
Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'

* commit '18c506e9e6e8df8b1d496d093077b8240ea68c28':
  avconv_dxva2: use the hwcontext device creation API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'
Hendrik Leppkes [Sun, 26 Jun 2016 13:29:39 +0000 (15:29 +0200)]
Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'

* commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6':
  avconv_vdpau: use the hwcontext device creation API

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa'
Hendrik Leppkes [Sun, 26 Jun 2016 13:25:38 +0000 (15:25 +0200)]
Merge commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa'

* commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa':
  hwcontext_vaapi: implement device creation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded'
Hendrik Leppkes [Sun, 26 Jun 2016 13:25:24 +0000 (15:25 +0200)]
Merge commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded'

* commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded':
  hwcontext_dxva2: implement device creation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '2e219b491bcc0845248345fdad31231b081e06d1'
Hendrik Leppkes [Sun, 26 Jun 2016 13:25:12 +0000 (15:25 +0200)]
Merge commit '2e219b491bcc0845248345fdad31231b081e06d1'

* commit '2e219b491bcc0845248345fdad31231b081e06d1':
  hwcontext_cuda: implement device creation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '38392b2af815898b8716826c4e29d95c04fb2647'
Hendrik Leppkes [Sun, 26 Jun 2016 13:24:53 +0000 (15:24 +0200)]
Merge commit '38392b2af815898b8716826c4e29d95c04fb2647'

* commit '38392b2af815898b8716826c4e29d95c04fb2647':
  hwcontext_vdpau: implement device creation

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d'
Hendrik Leppkes [Sun, 26 Jun 2016 13:23:24 +0000 (15:23 +0200)]
Merge commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d'

* commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d':
  hwcontext: add a function for opening devices

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '24b5cff01bbac4e08acfd6d19c499e880988f520'
Hendrik Leppkes [Sun, 26 Jun 2016 13:18:56 +0000 (15:18 +0200)]
Merge commit '24b5cff01bbac4e08acfd6d19c499e880988f520'

* commit '24b5cff01bbac4e08acfd6d19c499e880988f520':
  lavc: handle hw_frames_ctx where necessary

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '4024b566d664a4b161d677554be52f32e7ad4236'
Hendrik Leppkes [Sun, 26 Jun 2016 13:12:48 +0000 (15:12 +0200)]
Merge commit '4024b566d664a4b161d677554be52f32e7ad4236'

* commit '4024b566d664a4b161d677554be52f32e7ad4236':
  golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00'
Hendrik Leppkes [Sun, 26 Jun 2016 13:06:47 +0000 (15:06 +0200)]
Merge commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00'

* commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00':
  fate: More fine-grained dependencies for demuxer tests

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '07377fb557909015338b4c215b87b9c73ea577ad'
Hendrik Leppkes [Sun, 26 Jun 2016 12:58:58 +0000 (14:58 +0200)]
Merge commit '07377fb557909015338b4c215b87b9c73ea577ad'

* commit '07377fb557909015338b4c215b87b9c73ea577ad':
  fate: More fine-grained dependencies for voice codec tests

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b'
Hendrik Leppkes [Sun, 26 Jun 2016 12:51:33 +0000 (14:51 +0200)]
Merge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b'

* commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b':
  rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'
Hendrik Leppkes [Sun, 26 Jun 2016 12:49:10 +0000 (14:49 +0200)]
Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'

* commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298':
  avcodec: Bump micro version after changing public JPEG 2000 defines

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'
Hendrik Leppkes [Sun, 26 Jun 2016 12:41:05 +0000 (14:41 +0200)]
Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'

* commit 'ad61da054bd8c74a5d5b38d80846228fc6147108':
  jpeg2000: Fix profile define values

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'ac84e618df4765ba751327497994066d0931e6a8'
Hendrik Leppkes [Sun, 26 Jun 2016 12:40:19 +0000 (14:40 +0200)]
Merge commit 'ac84e618df4765ba751327497994066d0931e6a8'

* commit 'ac84e618df4765ba751327497994066d0931e6a8':
  avfiltergraph: check the query_formats() return value

This commit is a noop, see 6a4c5c730ed67a7f472e43205fd96e91781796ce

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'
Hendrik Leppkes [Sun, 26 Jun 2016 12:35:10 +0000 (14:35 +0200)]
Merge commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'

* commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e':
  lavc: document that avcodec_close() should not be used

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'
Hendrik Leppkes [Sun, 26 Jun 2016 12:34:53 +0000 (14:34 +0200)]
Merge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'

* commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f':
  lavc: deprecate avcodec_get_context_defaults3()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'
Hendrik Leppkes [Sun, 26 Jun 2016 12:34:02 +0000 (14:34 +0200)]
Merge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'

* commit '5f30ac27795f9f98043e8582ccaad8813104adc4':
  lavc: deprecate avcodec_copy_context()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '14634429b915333f3612eaf41db3954222dc4aaf'
Hendrik Leppkes [Sun, 26 Jun 2016 12:32:38 +0000 (14:32 +0200)]
Merge commit '14634429b915333f3612eaf41db3954222dc4aaf'

* commit '14634429b915333f3612eaf41db3954222dc4aaf':
  lavf: update muxing doxy

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'
Hendrik Leppkes [Sun, 26 Jun 2016 12:31:53 +0000 (14:31 +0200)]
Merge commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'

* commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3':
  mp3: Make the extrasize explicit

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '52567e8198669a1e7493c75771613f87a90466c3'
Hendrik Leppkes [Sun, 26 Jun 2016 12:19:48 +0000 (14:19 +0200)]
Merge commit '52567e8198669a1e7493c75771613f87a90466c3'

* commit '52567e8198669a1e7493c75771613f87a90466c3':
  get_bits: Drop some TRACE-level debug code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5'
Hendrik Leppkes [Sun, 26 Jun 2016 12:13:36 +0000 (14:13 +0200)]
Merge commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5'

* commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5':
  dump: Drop unused variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8'
Hendrik Leppkes [Sun, 26 Jun 2016 12:08:51 +0000 (14:08 +0200)]
Merge commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8'

* commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8':
  avconv: Use more precise deprecation ifdefs

The PSNR functionality is not deprecated in ffmpeg.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoMerge commit '35c858066840352d6d43385bbc728467c5150974'
Hendrik Leppkes [Sun, 26 Jun 2016 12:05:57 +0000 (14:05 +0200)]
Merge commit '35c858066840352d6d43385bbc728467c5150974'

* commit '35c858066840352d6d43385bbc728467c5150974':
  avconv: stop using AVStream.codec

Not merged, as ffmpeg.c is not migrated to codecpar yet, and this commit
only changes minor parts of AVStream.codec usage, which should get applied
after ffmpeg.c is using codecpar.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
3 years agoSet version to 3.1
Michael Niedermayer [Sun, 26 Jun 2016 09:35:22 +0000 (11:35 +0200)]
Set version to 3.1

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec: add YUY2 Lossless Codec decoder
Paul B Mahol [Mon, 13 Jun 2016 10:17:44 +0000 (12:17 +0200)]
avcodec: add YUY2 Lossless Codec decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
3 years agorelease notes (based on release/3.0)
Michael Niedermayer [Sun, 26 Jun 2016 01:57:55 +0000 (03:57 +0200)]
release notes (based on release/3.0)

Better release notes are welcome
write better ones or do not complain later!

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests/checkasm/checkasm: Disable checkasm_check_pixblockdsp for ppc64be
Michael Niedermayer [Sun, 26 Jun 2016 01:43:52 +0000 (03:43 +0200)]
tests/checkasm/checkasm: Disable checkasm_check_pixblockdsp for ppc64be

See: Ticket5508

Suggested-by: Carl
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/APIchanges: Add FFmpeg 3.1 cut marker
Michael Niedermayer [Sun, 26 Jun 2016 01:13:17 +0000 (03:13 +0200)]
doc/APIchanges: Add FFmpeg 3.1 cut marker

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/APIchanges: Fill in and correct more stuff
Michael Niedermayer [Sat, 25 Jun 2016 23:38:18 +0000 (01:38 +0200)]
doc/APIchanges: Fill in and correct more stuff

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/vf_paletteuse: enable skip_initial_unpaired
Michael Niedermayer [Fri, 24 Jun 2016 22:23:10 +0000 (00:23 +0200)]
avfilter/vf_paletteuse: enable skip_initial_unpaired

Fixes crash due to unprocessed input being passed through

This fixes the last segfault caused by mixing 3.0 and 3.1 libs and
applications

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/dualinput: Add support to skip initial unpaired frames
Michael Niedermayer [Fri, 24 Jun 2016 22:22:47 +0000 (00:22 +0200)]
avfilter/dualinput: Add support to skip initial unpaired frames

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/h264_sei: Do not skip subsequent SEIs on errors potentially caused by missing...
Michael Niedermayer [Tue, 21 Jun 2016 10:35:47 +0000 (12:35 +0200)]
avcodec/h264_sei: Do not skip subsequent SEIs on errors potentially caused by missing parameter sets.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/src_movie: Add option to remove timestamp discontinuities
Michael Niedermayer [Wed, 25 May 2016 15:55:29 +0000 (17:55 +0200)]
avfilter/src_movie: Add option to remove timestamp discontinuities

This can also be extended to remove discontiuities caused by seek commands

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/tee: Support arbitrary number of slaves
Jan Sebechlebsky [Sat, 25 Jun 2016 15:14:24 +0000 (17:14 +0200)]
avformat/tee: Support arbitrary number of slaves

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
3 years agoavcodec/nvenc: Bring encoder names in line with other encoders
Timo Rothenpieler [Sat, 25 Jun 2016 20:24:13 +0000 (22:24 +0200)]
avcodec/nvenc: Bring encoder names in line with other encoders

3 years agolavf/srtdec: fix indent
Rodger Combs [Sat, 25 Jun 2016 20:53:11 +0000 (15:53 -0500)]
lavf/srtdec: fix indent

3 years agolavf: update auto-bsf to new BSF API
Rodger Combs [Wed, 20 Apr 2016 06:15:35 +0000 (01:15 -0500)]
lavf: update auto-bsf to new BSF API

3 years agolavf: deprecate av_apply_bitstream_filters
Rodger Combs [Wed, 20 Apr 2016 06:11:59 +0000 (01:11 -0500)]
lavf: deprecate av_apply_bitstream_filters

3 years agolavf/srtdec: fix probing files with negative first timestamps
Rodger Combs [Mon, 6 Jun 2016 18:26:36 +0000 (13:26 -0500)]
lavf/srtdec: fix probing files with negative first timestamps