Merge commit '84c4714f397c9c50eb9d49008cc1c08385f68f31'

* commit '84c4714f397c9c50eb9d49008cc1c08385f68f31':
  lavc: Move brd_scale to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec: add dvaudio parser

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavc/mjpegdec: use ptrdiff_t instead of ssize_t

Fixes build on msvc.

avcodec/h264: Fix memleak in case of ff_h264_decode_extradata() failure

Fixes Ticket5139

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

qsvenc: Fix b_strategy typo

This was introduced in 0e6c8532215790bbe560a9eea4f3cc82bb55cf92.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

FATE: update AAC encoder PNS test target

Test target hasn't been updated with the latest changes.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

libavcodec/util: Fix timebase overflow check

It could accidentally divide by zero if num was zero.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

configure: fix openssl pkg-config check

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

configure: Revert recent changes to disable-everything

These will be re-merged once it's been fixed properly.

This reverts:
 * Commit '8e7bea6dc6ac5b21484774a026847bec0771ab62'
   configure: Improve requesting specific features
 * Commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0'
   configure: Force-enable select_any dependencies only on --enable

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec/version: Add missing #endif

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'

* commit '0e6c8532215790bbe560a9eea4f3cc82bb55cf92'
  lavc: Move b_frame_strategy and b_sensitivity to codec private options

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c'

This is a NOOP.

* commit '55c7e5bf7c8d368c9bc60a219b04849ec9f4c84c':
  riff: add C210 FourCC (Canopus C210)
  riff: add YUYV FourCC (Drastic YUYV)

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09'

* commit 'd43a165bda0eae95f4c7a168c7d13d94966c1a09':
  imgconvert: Add the proper API guards to a deprecated function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'f7168d7016f7d1034ec90223fa91a90711704e11'

* commit 'f7168d7016f7d1034ec90223fa91a90711704e11':
  imgconvert: Move AVPicture-related static function to the deprecated section

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '892f037c55d86ce36f8705fbeab052189312a13e'

* commit '892f037c55d86ce36f8705fbeab052189312a13e':
  imgconvert: Move the shrink functions only where needed

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6'

* commit '9d3ea5cbf57e30bf2717a9ce64e858dad8a02aa6':
  imgconvert: Drop outdated comment block

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'e93aa2c9e7b3599aee6a5820760fc1a2c629dea0'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '65d29dd274a302131e2e4bc6d2b1eca4a093900c'

This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '883ad2c59ceea1ced5495b5ccc83695ed4bbb94b'

This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '8e7bea6dc6ac5b21484774a026847bec0771ab62'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'e9175634ec96e36873929637491189150cfce9ec'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '472d488ebcc53bea4cdb124edb94558e72d8f23f'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '7486418683bd2477772e03aab573cf846c12fb0d'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'e59708bb9d94f67381f19344b5e021591eb711bf'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'c4de754d4dac5ddae4d5a6f02798c0f560771921'

This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '8fd361f53b3c17c1ae13a39e030c8fa3ab4d8f1f'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

lavc/mjpegdec: speed up scan data copy

Merge commit 'e4eb13ca77624401ea7cef1ed6ad8e2d13fd2063'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '09f4822e4eaf61513b9092414450f3ae920ccd9d'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '03ef89faf23c4851848208c9fe004cd9ef690cec'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '4f22b138886e29f7fffa8c715673951e51be9f32'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'b06cb15b9d7928bf54b639c9f9f7658c2c38bfb9'

One big NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'c59fec783d6540dd96540b079d753ee4a6ad2e58'

This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '39571e86cb0d55536f649210a025c54e440c632b'

This is a NOOP.

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '9cce011b1d2f66366f5d75a024c2a2f93dc2b589'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '521dc78366c6ea54b7b69426dab302a57231f81e'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'fa66237b69c27befa788b100e73783e0f47fe1b7'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '62825236dba31a2240e25974a3ba41c1303e4edc'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '81737f42c28858dad76a40284a35f7a64faa2fc7'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '46350db737a15910f468d30cf7beda16a4cc8332'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit 'e8bc642202c10beda1ea4e93ec8492b1e39805e5'

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avutil: Rename FF_CEIL_COMPAT to AV_CEIL_COMPAT

Libav, for some reason, merged this as a public API function. This will
aid in future merges.

A define is left for backwards compat, just in case some person
used it, since it is in a public header.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avcodec/jpeg2000dec: More completely check cdef

Fixes out of array read
Fixes: j2k-poc.bin
Found-by: Lucas Leong <wmliang.tw@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/dvaudiodec: support cases when codec_tag is not set but block_align is

Support packets larger than block size, return single block size.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/dvaudiodec: set channel layout

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/af_afade: do not duplicate curve option

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavc/mjpegdec: Set SAR even if no resolution is available.

Fixes ticket #4479.

lavc/h264: Show "Increasing reorder buffer" message with loglevel info.

See ticket #5138 for a sample.

avformat/mux: Fix error when writing uncoded frames.

commit "avpacket: Deprecate av_dup_packet" broke the use
av_interleaved_write_uncoded_frame as any input uncoded frame has an
invalid packet size that will crash when av_packet_ref tries to allocate
'size' new memory. Since the packet is a temporary created within mux.c
itself it can be used directly without needing a new ref.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>

svq1enc: fix out of bounds reads

level can be 5, but there are only four codebooks.

Fixes ubsan runtime error: index 5 out of bounds for type 'int8_t
[4][96]'

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

avcodec/dvaudiodec: only stereo makes sense

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec: add Ulead DV audio decoder

Fixes #1564.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/vf_zscale: make it possible to override input frame parameters

Mostly useful when there is no such parameters present at all.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avformat/flvenc: copyts in FLV muxer

The purpose of this patch is to preserve timestamps when using ffmpeg for publishing RTMP streams, e.g. ffmpeg -i rtmp://source/stream -f flv rtmp://target/stream.
There is a setting "copyts" for that purpose. Unfortunately it doesn't work with FLV muxer because it has its own timestamp correction which makes global setting "copyts" ineffective.

This patch removes timestamp correction in FLV muxer. This means FLV will rely on ffmpeg timestamp correction which makes it possible to use copyts.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ffmpeg_opt: Allow -metadata option to set metadata on programs.

Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ffmpeg_opt: Move the 'process manually set programs' block above 'process manually set metadata' in open_output_file().

Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avutil/opt: check for and handle errors in av_opt_set_dict2()

Previously errors could result in random entries to be lost.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

swscale: add P010 input support

avutil: add P010 pixel format

P010 is the 10-bit variant of NV12 (planar luma, packed chroma), using two
bytes per component to store 10-bit data plus 6-bit zeroes in the LSBs.

vf_libopencv: add support for opencv 3

It dropped the old headers, but the replacements are already available
with opencv 2.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

lavc/libzvbi-teletextdec: add support for setting background opacity

Signed-off-by: Marton Balint <cus@passwd.hu>

lavc/libzvbi-teletextdec: remove cmax variable

Use VBI_NB_COLORS instead.

Signed-off-by: Marton Balint <cus@passwd.hu>

lavc/libzvbi-teletextdec: use the built-in transparent color for transparent background

Signed-off-by: Marton Balint <cus@passwd.hu>

build: use a link instead of changing current directory when compiling

If links don't work, fall back to using the full source path as was
previously done.

This should fix build failures with MSVC.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

avformat/mpegtsenc: Fix multi program so that it supports adding the same stream to multiple programs.

Signed-off-by: Vittorio Gambaletta <ffmpeg-dev@vittgam.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavc/rawdec: Use 16-byte line alignment for AV_PIX_FMT_MONOWHITE

The line alignment for 1 bpp raw AV_PIX_FMT_MONOWHITE video (currently
used for AVI) was previously 4 bytes, which generated alignment warning
messages, not only for odd-width files. The alignment is now 16 bytes.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/synth_filter: split off remaining code from dcadec files

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

avcodec/dcaenc: do not change user requested bitrate

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/dcaenc: return correct number of bytes in output packet

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/utils: run ff_frame_thread_encoder_init() only for encoders

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/rawdec: Check height and packet size

Avoids potential division by 0

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavc/rawdec: Use 16-byte line alignment for 1, 2, 4 and 8 bpp

This patch aligns the lines of 1 bpp depth for QuickTime, and 2, 4 and 8
bpp depths for AVI and QuickTime, on 16-byte boundaries. At the same
time, the packet row stride is properly catered for.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/rawdec: initialize palette for mono

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/webp: fix decoder dependencies

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

avformat/hls: Check that filename is not "" in probe before checking its extension

Possibly the check as a whole causes more problems than it helps, if so dont
hesitate to remove it

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/flacenc: fix calculation of bits required in case of custom sample rate

Sample rate of 11025 takes 16 bits but previous code would pick only 8.
Fixes assertion failure.

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Revert "decklink: Header cleanup"

This reverts commit 61fb70c3866b19dccf473ad4e5ede79d117e8e1c.

Reported in #5183 to break the build. Further investigation needed.

avfilter/vf_zoompan: fix pts handling

Now output pts have some sense.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter/vf_zoompan: unbreak filtering with video input

Inserting fifo appears to be working solution to not get
filter_frame request we do not want.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Changelog: Add entry on libquvi being removed

configure: Maintain alphabetical order of components

This is not "pure" alphabetical order since some components are
intentionally kept together.

avfilter/vf_zoompan: rewrite so it doesn't cache all output frames

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi: recognize GBR9-14P as RGB in ff_fill_rgba_map().

avformat: Remove support for libquvi

libquvi has not been updated since 2013.
It also has a number of security issues.

Print the whitelists if entities are not found on them

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat: Document urls a bit

Spell-checked-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

decklink: Header cleanup

This commit cleans up the decklink files' header usage so that they pass
checkheaders.

common.mak: Use CCFLAGS for assembly generation as well

CCFLAGS is equivalent to CPPFLAGS + CFLAGS, and it is already being used
by other make rules like %.i and %.o. Simplifies common.mak.

avdevice: Mark decklink_common.h as unconditional SKIPHEADER

It is a C++ file, incompatible with the checkheaders infrastructure.

lavfi/pthread: fix perameters/parameters typo

avfilter: update some comments

start_frame is no more, samplesref argument is now frame argument.

Signed-off-by: Paul B Mahol <onemda@gmail.com>

build: fix msvc build

Fix configure to set DST_PATH to the Windows style path when building with MSVC

Fixes ticket #5180.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

build: fix make checkheaders in out-of-tree builds

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

fate/cabac: replace uninitialized bytes by random bytes

Fixes valgrind warning

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/vf_convolution: Use av_clip_uint8()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

fate/ffmpeg: Fix colorkey test failure without samples

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

dxva2_h264: fix reference field marking in long slice struct

Fixes artifacts in interlaced decoding on old Intel GPUs.

avcodec/mpeg4videoenc: Use 64bit for time variables

Fixes assertion failure and integer overflow
Fixes: fc677bbea2c6f901763eb637b61fa5e2/signal_sigabrt_7ffff6ae7cb7_9556_dfd95f040a69f725d1b2f861bd491725.ivf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/libquvi: Set default demuxer and protocol limitations

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/concat: Check protocol prefix

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>