Merge commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3'

* commit 'ede508443e4bf57dc1e019fac81bf6244b88fbd3':
  vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'

* commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8':
  wnv1: Make sure the input packet is large enough

Conflicts:
libavcodec/wnv1.c

See: f23a2418fb0ccc56fdae4dbf83a5994cc917c475
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730'

* commit 'f1eac2b8a0370b908cd691086d11f51342054730':
  movenc: Use keyframes as default fragmentation point in ismv

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd'

* commit 'a9553bbb336a7186c62b3b14a0499c1b6ba61ebd':
  movenc: Set all implicit flags immediately in mov_write_header

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '187023f6b2b43966acb2449a379b4ededdc4b22e'

* commit '187023f6b2b43966acb2449a379b4ededdc4b22e':
  movenc: Set mov->mode earlier in mov_write_header

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3'

* commit '5055035670bd1a1eaca64bd3bc71fb07de9df2c3':
  tls: Do not abort on non-fatal TLS alerts with gnutls

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'c951e4b442df9dde6051634a85359eb809bf2142'

* commit 'c951e4b442df9dde6051634a85359eb809bf2142':
  flv: Make onTextData parsing robust

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6'

* commit 'ba77757a7efafe38924b6b423acfca8c1e1c62d6':
  rtmp: Replace a magic number with a macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5840473890440dbe0bd2cce530ebb3d93e187ae6'

* commit '5840473890440dbe0bd2cce530ebb3d93e187ae6':
  rtmp: Rewrite embedded flv handling

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'e40a0e822801d2485e4e555909d7a82713fa86a5'

* commit 'e40a0e822801d2485e4e555909d7a82713fa86a5':
  rtmp: Refactor get_packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2'

* commit '32a414f316c7f0eea877370e3f9d9f25afbf5da2':
  rtmp: Support AMF_DATA_TYPE_MIXEDARRAY

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libopenjpeg: init and close properly; don't config during encode

Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/escape124: fix infinite loop

Remove can_safely_read() as its not really needed with
checked bitstream reader.

Fixes #2984.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>

doc/filters: add [] labels for the graph of the opening paragraph example

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

doc/filters: use between() function in select examples

Simplify.

doc/fftools: rework some paragraph in the AVOptions chapter

Fix typos, and clarify note about codec AVOptions.

doc/filters: put ladspa configure option into @code{}

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

tests/fate/prores: fix skip alpha tests on big endian

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/avcodec.h: skip_alpha should not be accessed directly (would cause ABI issues)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/filters: mention configure option for ladspa

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

lavc: Add support for interleaved chroma formats to libx264. Interleaved chroma is x264's native format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/sgirledec: fix infinite loop in decode_sgirle8()

Fixes #2985.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>

avfilter: add ladspa wrapper filter

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

Make decoding alpha optional for some codecs.

For codecs where decoding of a whole plane can simply
be skipped, we should offer applications to not decode
alpha for better performance (ca. 30% less CPU usage
and 40% reduced memory bandwidth).
It also means applications do not need to implement support
(even if it is rather simple) for YUVA formats in order to be
able to play these files.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

avformat/mov: reset extradata size when extradata gets deallocated due to realloc failure

This prevents the fields from becoming inconsistent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix nonsense MPEG-4 hwaccel code.

Issues with the code:
1) The skip_bits_long breaks packed B-frames since we skip
of the packed frame, even for VDPAU.
2) Calling ff_h263_find_resync_marker_reverse is nonsense for MPEG-4,
and for H.263 the only code using this (vaapi_mpeg4) explicitly reverts
this change!
3) mb_x/mb_y are always 0 when vaapi_mpeg4_decode_slice, so doing
computations with them is just obfuscation
4) due to not updating mb_y the code would always go into the error
resilience case, causing nonsense error messages and maybe further
issues.

While tested to fix the data provided to the decoder in case of
VDPAU so it is the same as for the non-hwaccel code, the VA-API code
was not tested to still work, and adding regression testing even
as a quick hack is much more complicated for it.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

wnv1: Make sure the input packet is large enough

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

movenc: Use keyframes as default fragmentation point in ismv

Fragmenting blindly to a certain duration isn't a good choice
if one should be able to switch between different qualities,
therefore default to keyframes instead.

Signed-off-by: Martin Storsjö <martin@martin.st>

movenc: Set all implicit flags immediately in mov_write_header

This makes sure other sanity checks for conflicting options
can work properly, e.g. for the conflict between the faststart
flag when using the ismv mode.

Signed-off-by: Martin Storsjö <martin@martin.st>

movenc: Set mov->mode earlier in mov_write_header

This allows simplifying some early checks that depend on the
muxer mode.

Signed-off-by: Martin Storsjö <martin@martin.st>

tls: Do not abort on non-fatal TLS alerts with gnutls

Signed-off-by: Martin Storsjö <martin@martin.st>

avformat/movenchint: use realloc_array() to protect against integer overflow

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/movenchint: only change queue size if reallocation succeeded

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/movenchint: revert "Use av_reallocp() where suitable"

reverts movenchin part of 5626f994f273af80fb100d4743b963304de9e05c
The change left the fields in an inconsistent state

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avutil: Fix compilation with inline asm disabled on mingw

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'

* commit 'e208e6d209728d332343aa5390ae377ac0a6305c':
  lavu: Add interleaved 4:2:2 8/10-bit formats

Conflicts:
doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h

See: 90ca5a9b5fc3f1484c389a44f40ee1af4b8f435e
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avutil/pixdesc: try to fix NV20* descriptors

They where inconsistent (overlapping fields and wrong sizes)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add interleaved 4:2:2 8/10-bit formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

flv: Make onTextData parsing robust

Certain streaming servers do not preserve the order of the fields.

rtmp: Replace a magic number with a macro

11 is the RTMP header size.

rtmp: Rewrite embedded flv handling

Use update_offset() as done for rtmp audio, video and notifications and
read update and write the fields instead of replacing them in the rtmp
packet and then memcpying it to the output buffer.

rtmp: Refactor get_packet

rtmp: Support AMF_DATA_TYPE_MIXEDARRAY

And fix the AMF_DATA_TYPE_ARRAY parsing while at it.

A MIXEDARRAY type, as the ARRAY, store the number of elements in
an uint32 before the list. The ARRAY is strict and does not have
an OBJECT terminator, MIXEDARRAY behaves like an OBJECT type and
a different than stated number of element can be present.

avcodec/g2meet: Fix framebuf size

Currently the code can in some cases draw tiles that hang outside the
allocated buffer. This patch increases the buffer size to avoid out
of array accesses. An alternative would be to fail if such tiles are
encountered.
I do not know if any valid files use such hanging tiles.

Fixes Ticket2971
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

changelog: add fraps and libx264 changes

avutil: Fix compilation with inline asm disabled on mingw

Because of -Werror=implicit-function-declaration the build will fail.

Signed-off-by: Martin Storsjö <martin@martin.st>

avformat/hls: do not limit manifest lines to 1024 chars

Fixes Ticket2976
Debuged-by: jaimeMF
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu: Add interleaved 4:2:2 8/10-bit formats

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

avcodec: fix duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/network: fix duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf/libssh: add MAINTAINERS entry

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/attributes: Don't define av_restrict

This is always defined in config.h.

Original patch by Derek Buitenhuis.

avformat: remove duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avdevice/v4l: remove duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter: remove duplicate includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/cpu: remove duplicate include

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/fraps: use BT.709 colorspace for YUV Fraps versions

Based both on comparison to the reference decoder, and comments from
the fraps developers upon inquiry how to handle the yuv fraps variants.

lavfi/pad,crop,scale: remove options description from filter description

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

avfilter/vf_tinterlace: add yuv411p, yuv440p, yuva422p and yuva444p

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

tools: Fix apparent merge failure

matroska: Add the CueDuration element

Use it only on subtitle CuePoints.
With proper demuxer/splitter support this should improve the display
of subtitles right after seeking to a given point in the stream.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Allow encoding YUVJ422P and YUVJ444P with libx264.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Remove '-vf' from pullup documentation example.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264dec: Add .avc file name extension

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9'

* commit '01f111bdb21b4ea6d2ff3ea919d70ae9ca451cf9':
  h264dec: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Allow encoding YUVJ422P and YUVJ444P with libx264.

Reviewed-by: Reimar

mpeg4dec: Ensure data is not clobbered too early.

Avoid overwriting the bitstream buffer data before we
have ended processing the frame.
This is necessary to fix hwaccels which might try to use
the buffer during the end_frame call.
I am not sure but it is possible this could even trigger
a use-after-free if the av_fast_malloc allocated a new buffer.
This would require that decode_slice did not wind the bitstream
forward all the way to the end, which does not currently happen in
normal streams.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Merge commit '67e285ceca1cb602a5ab87010b30d904527924fe'

* commit '67e285ceca1cb602a5ab87010b30d904527924fe':
  mem: Handle av_reallocp(..., 0) properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>

fate: add adelay test

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

dvbsubdec: Check for invalid clut selector.

Fail decoding if strict compliance is requested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

Apply clut changes only to one table.

The specification does not allow multiple bits to be set,
but some encoders do it anyway.
Applying it only to the first seems to give better results.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

lavf: add SFTP protocol via libssh

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Improve pullup documentation.

Mention that the fps filter should be used after pullup.

avfilter/vf_psnr: avoid 64bit arithmetic in the inner loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/vf_psnr: Prevent integer overflow.

The 32-bit integer accumulator in MSE computation can overflow for 8-bit frame data.
(e.g., for 1080p white frame compared to a black frame can give sum of 255*255*1080*1920 > 2^32).

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/utils: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/avienc: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

matroskaenc: Add CuePoints for subtitle tracks

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

h264dec: Add .avc file name extension

Signed-off-by: Diego Biurrun <diego@biurrun.de>

h264dec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>

mem: Handle av_reallocp(..., 0) properly

Previously this did a double free (and returned an error).

Reported-by: Justin Ruggles
Signed-off-by: Martin Storsjö <martin@martin.st>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: remove an unused static constant

Merge only for metadata as the constant us not unused in ffmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '33b88f2a4ae54d5397c45e39a5326289ebdc7747'

* commit '33b88f2a4ae54d5397c45e39a5326289ebdc7747':
  msvc/icl: Use __declspec(noinline)

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'

* commit '09f2581dc5edb3642858d69d9a70b67e249167e9':
  msvc/icl: Use __declspec(deprecated)

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91'

* commit '5532ee6d7d554bb54d4374d0b69f72bc9ab9fd91':
  rtmp: Unbreak get_packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e'

* commit 'a9d50bb578ec04c085a25f1e023f75e0e4499d5e':
  dcadec: Validate the lfe parameter

Conflicts:
libavcodec/dcadec.c

See: 3b2cd83a829e01a603b52fdc058a054b7899d06e
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4'

* commit 'b97b1adb3f807e1acd00d56319ee6cb41cc727e4':
  rtmpproto: Add a comment explaining the logic in handle_notify

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'e5d45e028cf4193b562075897e55091779e49f15'

* commit 'e5d45e028cf4193b562075897e55091779e49f15':
  build: Support cparser

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd8798276b65543d921adadf63cc7f5ba2d1604af'

* commit 'd8798276b65543d921adadf63cc7f5ba2d1604af':
  r3d: Add more input value validation

Conflicts:
libavformat/r3d.c

See: 99b1b2b1c65969ee324d754ea47e04a0a3f685a8
See: df92ac18528bac4566fc4f5ba4d607c1265791ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44'

* commit '3ca14aa5964ea5d11f7a15f9fff17924d6096d44':
  rl2: Avoid a division by zero

See: f371396dfb95c116a05e9b9f690fa916bb2d815e
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947'

* commit '83c285f88016b087c2f0f4b9ef356ad8ef12d947':
  wtv: Add more sanity checks for a length read from the file

Conflicts:
libavformat/wtv.c

See: c42efad3c34cace09555e05fd0cb81cb59cc726f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd8b68660145c76a23fc9665f96932449514ecad2'

* commit 'd8b68660145c76a23fc9665f96932449514ecad2':
  yop: Clear all references to the AVBuffer in the local AVPacket

Conflicts:
libavformat/yop.c

See: 551f683861bbae1002542e70dc196244a1cd24ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '3185a80259ce1f8f8111073dbd14a69a396e03a3'

* commit '3185a80259ce1f8f8111073dbd14a69a396e03a3':
  fraps: Make the input buffer size checks more strict

Conflicts:
libavcodec/fraps.c

The added checks are mostly to handle duplicate frames, which
we discard, thus there are also no P frames for example.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '82e266c6d3fbf3cc74e515b883e66543381a0f2c'

* commit '82e266c6d3fbf3cc74e515b883e66543381a0f2c':
  segafilm: Validate the number of audio channels

Merge only for metadata as the change is incorrect, checking audio
parameters in video only files

See: 192db16b9c202e8d037c4820b11e125d8010e7bc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

h264: remove an unused static constant

Signed-off-by: Martin Storsjö <martin@martin.st>

msvc/icl: Use __declspec(noinline)

Signed-off-by: Martin Storsjö <martin@martin.st>

msvc/icl: Use __declspec(deprecated)

Prior to this on msvc/icl there was no handling of deprecated functions
and the deprecated warning was disabled.

After enabling there are a number of warnings relating to the CRT and
the use of the non-secure versions of several functions.  Defining
_CRT_SECURE_NO_WARNINGS silences these warnings.

Signed-off-by: Martin Storsjö <martin@martin.st>

rtmp: Unbreak get_packet

Commit 5626f994f273af80fb100d4743b963304de9e05c broke it.

Merge commit '601c2015bc16f0b281160292a6a760cbbbb0eacb'

* commit '601c2015bc16f0b281160292a6a760cbbbb0eacb':
  svq3: Avoid a division by zero

Conflicts:
libavcodec/svq3.c

See: 4fa706a4a64f9e06b08c1a42a62893ff2f7de82f
Merged-by: Michael Niedermayer <michaelni@gmx.at>