Merge commit '19f53840001a7afcdb57b2a797e363ec8081aba3'

* commit '19f53840001a7afcdb57b2a797e363ec8081aba3':
  h264_parser: Fix order of operations

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

Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5'

* commit 'f825d42bccdb9f89669a586951de7f66a81e80a5':
  avplay: Accept cpuflags option

Conflicts:
cmdutils_common_opts.h
doc/ffmpeg.texi
doc/fftools-common-opts.texi
ffmpeg_opt.c

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

vp9: always consume the full input packet

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vcr1: print the actual size when its insufficient

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

avcodec/vcr1: Fix bitstream input size check

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

nut: Fix unchecked allocations

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

lavfi/pthread: Avoid crashes/odd behavior caused by spurious wakeups

This is similar to 5152196b2b47d446d9a509b9bfb318daa26a1f2b.

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

libavcodec/mpegaudio_tablegen: clip value before casting

Avoids FPE on alpha

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

h264_parser: Fix order of operations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

avplay: Accept cpuflags option

Quite useful for debugging.

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

hevc: fix transform_skip which is only valid for 4x4(cherry picked from commit 740e5a71e5121dbf3fabdc4fec97829c18ecc2d8)

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

hevc: pretty print(cherry picked from commit 6332b3afe298b9e1060e8549aea3aa2771b43f5d)

Conflicts:

libavcodec/hevc.h
libavcodec/hevc_filter.c
libavcodec/hevc_refs.c

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

hevc: cleaning disable field in deblocking filter(cherry picked from commit 7dd7a27ae850a51b3c9cd07046c422677398f6d5)

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

hevc: remove disable_au option(cherry picked from commit e90b3f6753d645fec076e951a0597a5dc2d2fe31)

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

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavf/tee: fix leak of bsfs array.
  lavf/tee: fix leak of select option.
  lavf/tee: fix leak of strdup/strtoked buffer.

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

h263dec: use init_get_bits8() and check its return code

Fixes null pointer dereference

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

avformat/bintext: protect against potential overflow of chars_per_frame

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

avfilter: replaygain scanner

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avio: Use AVERROR_PROTOCOL_NOT_FOUND

Conflicts:
libavformat/avio.c

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

Merge commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b'

* commit '5152196b2b47d446d9a509b9bfb318daa26a1f2b':
  pthread: Avoid spurious wakeups

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

Merge commit '23e6d3d4e27c83e06d00aa072c84d057bd1dad23'

* commit '23e6d3d4e27c83e06d00aa072c84d057bd1dad23':
  fate: vpx: Remove one redundant $(eval) invocation

Merge for meta data only as this breaks the affected fate tests

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

lavf/tee: fix leak of bsfs array.

lavf/tee: fix leak of select option.

lavf/tee: fix leak of strdup/strtoked buffer.

Fix CID 1108606.

avfilter/ff_insert_pad: fix order of operations

Fixes out of bounds access
Fixes CID732170
Fixes CID732169

No filter is known to use this function in a way so the issue can be reproduced.

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

make it possible to compile ffmpeg without swscale

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

avio: Use AVERROR_PROTOCOL_NOT_FOUND

When the protocol is missing ffurl_alloc() should return
AVERROR_PROTOCOL_NOT_FOUND instead of AVERROR(ENOENT).

Bug-Id: 577
CC: libav-stable@libav.org

avformat/mxfdec; parse random index pack to get last partition offset and use it when footer partition offset is missing

Footer partition may not be present and even if present footer partition
offset may not be set in any partition except last one.

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

pthread: Avoid spurious wakeups

pthread_wait_cond can wake up unexpectedly (Wikipedia: Spurious_wakeup).

The FF_THREAD_SLICE thread mechanism could spontaneously execute
jobs or allow the caller of avctx->execute to return before all
jobs were complete.

Test both cases to ensure the wakeup is real.

Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

fate: enable hevc tests

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

Support FF_DISABLE_DEPRECATION_WARNINGS with icc on Linux.

ffprobe: fix consistency checks in parse_read_intervals()

Move array size assert after the count increment, and avoid strchr() NULL
dereference on p.

Should fix FFmpeg coverity issue #1108581.

avcodec/hevc: fix duplicate/wrong nal unit check and difference to openhevc_upstream

NAL_BLA_W_RADL instead of NAL_BLA_N_LP

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

fate: add synthetic swresample resampling tests

this is based on libavresample.mak

These tests do not depend on external samples

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

avformat/vobsub: fix invalid sub queue access while seeking.

If there is only 1 stream and seek isn't called with a specific stream
index, we pick the first (and only) one.

Regression since dbfe6110.

Fixes CID1108591.

avcodec/vp9dsp: fix overwrite by 1 in vert_left pred.

The memset following the memcpy was silencing the problem since
re-writing that same byte.

Fixes CID1108597, CID1108598, (16x16)
      CID1108599, CID1108600, (8x8)
      CID1108601, CID1108602  (32x32)

Signed-off-by: Clément Bœsch <u@pkh.me>

lavc: make avcodec_decode_subtitle2 more robust

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

MAINTAINERS: add lavd/fbdev_enc entry

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

lavd/pulse_audio_enc: add support for flushing

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

avutil/opt: initialize ret

Fixes CID1108610
Fixes use of uninitialized variable

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

avutil/file_open: Print debug message if setting close on exec fails

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

avformat/utils: Check av_packet_new_side_data() return before using it

Fixes null pointer dereference
Fixes CID1108592
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/oggparsespeex: Check for extradata allocation failure

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

avformat/oggparseflac: check ff_alloc_extradata() return code

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

avformat/oggparsecelt/celt_header: fix memleak

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

avformat/network: check for fcntl() failure in ff_socket()

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

avformat/au: add assert to help source code analyzers

See: CID1108585 and CID1108603
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vp9: Add asserts to help source code analyzers

See CID1108596 and CID1108595
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

hevc: Initialize sample aspect to valid value.

Without this, it is 0/0 by default, which is not allowed.
This sets it to 0/1, which means "undefined".

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

hevc: pretty print(cherry picked from commit 64a4b623b7d66dfc0f3883e5f1d9125c00c3b18c)

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

hevc: fix PPS_A_qualcomm_7(cherry picked from commit 2af177a8761c88eb477a658eebcf4264068aa773)

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

avcodec/wavpackenc: fix uninitialized ret

Fixes CID1108609

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

avcodec/tiff: remove byte based bpp special case

This case does not work as off is uninitialized and it should be
handled fine by the generic code below

Fixes CID1108608

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

avcodec/hevc_refs: fix h/vshift calculation in ff_hevc_output_frame()

Fixes CID1108577

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

avcodec/hevc: do not dereference pointer before null check in verify_md5()

Fixes: CID1108607

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

avcodec/hevc_cabac: trivial simplifications

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

hevc: inline cabac in hls_mvd_coding(cherry picked from commit ad387195ad04e8a005a1bfd509e9e4f827e68fa9)

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

hevc: inline cabac in residual coding(cherry picked from commit 17d7a880445b72feb36d684ae1f0597195811e97)

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

avcodec/hevc: fix EOB/EOS check

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

avcodec/h264_parser: fix order of operations

Fixes CID1108576

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

ffv1enc: use 64bit in maxsize calculation

This isnt needed but it cant hurt, its also more consistent with
how its calculated a few lines before.

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

avcodec/exr: fix null pointer dereference

Fixes CID1108582

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

avcodec/exr: favor av_freep() over av_free() for saftey

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

avformat/oggdec: favor av_freep() over av_free()

Found-by: Reimar Döffinger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/utils: add some saftey checks to add_metadata_from_side_data()

This fixes potential overreads with crafted files.

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

avcodec/avpacket/av_packet_split_side_data: ensure that side data padding is initialized

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

Do not leave positive values undefined when negative are defined as error

Define positive return values as non errors and leave further meaning undefined
This allows future extensions to use these values

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

doc/developer: Add a policy item about updating the MAINTAINERs file

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

fate: vpx: Remove one redundant $(eval) invocation

avformat/wtvdec: drop SHIFT_SECTOR_BITS() macro

it just wraps around a bitwise shift, and makes the code harder to read

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Seek by sector properly

Conflicts:
libavformat/wtvdec.c

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

avformat/wtv: rename to wtv_common

This helps git matchup files on merges correctly

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

MAINTAINERS: add Timothy to documentation

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

configure: remove \r from cc_ident,

This should fix cygwin + non-cygwin toolchain

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

lavd/pulse_audio_enc: fix error check

Error check should be done by checking negative value, not non-zero.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

lavd/fbdev: use av_str2err() macro for printing error messages

In particular fix wrong strerror(ret) with a negative value, and avoid
the use of non thread-safe strerror().

lavd/pulse_audio_dec: apply cosmetic changes

In particular, fix punctuation in docs and make option help messages
grammatically consistent.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

lavd/fbdev: pass proper memory map length

fbdev->data was allocated with size fbdev->fixinfo.smem_len, release data
in fbdev_read_close() using the same size.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

MAINTAINERS: add my name to a few entries

Fix decoding of G.726 in AIFF.

Fixes ticket #1973.

lavf/riff: Fix a comment.

FourCC aivx refers to (Sony) XAVC, not (Panasonic) AVC-Intra.
Spotted by Kieran Kunhya and Vincent Olivier.

avformat: Use G726LE decoder for Sun AU files

fixes ticket #1955 as suggested by Roman.

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

avcodec: Add little-endian G726 decoder

Fixes part of Ticket1955
suggested by Roman.

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

Support 4k AVC-Intra in mov.

wtv: Seek by sector properly

Use an helper function to seek by sector to avoid possible mistakes
due shifting by WTV_SECTOR_BITS a 32bit integer.

Contrary to common intuition, a 32 bit integer left shifted
by a 64 bit integer does not promote the 32 bit integer to
64 bit before shifting.

avformat/flvdec: use avpriv_request_sample()

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

avcodec/hevcpred: fix make checkheaders.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: Increase the tolerance in the lavr tests

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

Merge commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92'

* commit 'f52fd3f3b26f0d80e4f0b374b7695383feca5b92':
  fate: aac: Add test for AAC-LD

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

lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT

Improve interface flexibility. In particular makes it possible to set
channel layout through symbolic names using the av_opt_set() interface.

fate: Increase the tolerance in the lavr tests

A few fate instances on OS/2, OpenBSD, FreeBSD and IA64 linux currently
still fail a few tests with a maxdiff of 6.

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

lavu/opt: add AV_OPT_TYPE_CHANNEL_LAYOUT and handler functions

The new type is compatible with AV_OPT_TYPE_INT64, but allows to specify
channel layouts using the format accepted by av_get_channel_layout().

lavu/channel_layout: change av_get_channel_layout() behavior at the next bump

The new syntax is preferred since it allows backward syntax compatibility
with libswr when switching to the new option handling code with
AV_OPT_TYPE_CHANNEL_LAYOUT.

With the new parser the string:
1234

is interpreted as a channel layout mask, rather than as a number of
channels, and thus it's compatible with the current way to set a channel
layout as an integer (e.g. for the icl and ocl options) making use of
integer option values.

ff_get_channel_layout() with compat=0 will be used in the
AV_OPT_TYPE_CHANNEL handler code.

The user is encouraged to switch to the new forward compatible syntax,
which requires to put a trailing "c" when specifying a layout as a number
of channels.

lavu/opt.h: fix grammar typo in av_opt_get* doxy

lavu/opt-test: use automatic set and free handlers

In particular, do not set default string value by hand and use
av_opt_free() to free context.

swscale/yuv2rgb: clip cy, avoid division by 0 with 0 contrast

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

swscale/utils/sws_setColorspaceDetails(): fix indention

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

fate: aac: Add test for AAC-LD

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add some necessary casts in the wtv demuxer.

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

avformat/hevcdec: add more irap cases to hevc_probe()

This fixes fate-hevc-conformance-RAP_A_docomo_4

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