Merge commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816'

* commit '559fa0d41b5cf8f7e1ba89d1ac70e74712eb2816':
  vdpau: add mapping for H.264 Constrained Baseline profile and fallback

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

Merge commit '8502c1e9ff9c1dbb6e467630c048d098f4064021'

* commit '8502c1e9ff9c1dbb6e467630c048d098f4064021':
  vdpau: add mapping for H.264 Extended profile

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

Merge commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9'

* commit '8b51bcfed75721e0d20832e5a90e1d585318c9d9':
  vdpau: revector macro to reduce line span

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

Merge commit 'e10e6651b50b4087f08813f3e503620db7413d3a'

* commit 'e10e6651b50b4087f08813f3e503620db7413d3a':
  thread: use "" instead of <> for including the w32pthreads wrapper

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

avformat/utils: Do not update programs streams from program-less streams in update_wrap_reference()

Fixes Ticket3686

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

avformat/mp3dec: Name the dummy variable as what it is, to avoid confusion

Found-by: nattyzs <nattyzs@163.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vdpau: add mapping for H.264 Constrained Baseline profile and fallback

Old VDPAU drivers do not support this newly defined profile, so falling
back to Main profile is necessary for backward binary compatibility.

Signed-off-by: Anton Khirnov <anton@khirnov.net>

vdpau: add mapping for H.264 Extended profile

Signed-off-by: Anton Khirnov <anton@khirnov.net>

vdpau: revector macro to reduce line span

Signed-off-by: Anton Khirnov <anton@khirnov.net>

thread: use "" instead of <> for including the w32pthreads wrapper

Found-by: Dave Yeo <dave.r.yeo@gmail.com>

avformat/aviobuf: Check that avio_seek() target is non negative

Fixes out of array access

Suggested-by: Andrew Scherkus <scherkus@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/vf_dctdnoiz: use av_freep() to avoid leaving stale pointers in memory

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

avfilter/f_sendcmd: Use av_freep() to avoid leaving stale pointers in memory

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

avcodec/xiph: mark returned header pointers const from avpriv_split_xiph_headers()

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

avformat/nutenc: store the actual r_frame_rate in the corresponding field if available

Fixes Ticket 3629 part3

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

ffmpeg: forward r_frame_rate to the muxer in case of stream copy

Fixes Ticket3629 part2

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

avformat/utils: use r_frame_rate only in the demuxer for ff_compute_frame_duration()

This is primarly to maintain current behavior when r_frame_rate is set for muxers
and could be reverted if it has some advantage

Fixes Ticket3629 part1

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

avcodec: fix wording in AVSubtitleRect doxy

swresample/soxr_resample: fix error handling

Fixes CID1257659

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

fix "than" typo

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

avformat/utils: Do not estimate the container bitrate from the streams if one video stream lacks the bitrate

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

avfilter/vf_uspp: fix gray pixfmt handling

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

avfilter/vf_uspp: fix used chroma subsampling factors

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

avfilter/vf_uspp: fix used pix_fmt

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

avcodec/dvdsubdec: Avoid strerror() due to thread saftey

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

avcodec/libxvid_rc: Avoid strerror() for thread saftey

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

avformat/mov: Simplify code by using OFFSET() and FLAGS macros

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

avfilter/vf_kerndeint: use av_freep(), avoid leaving stale pointers in memory

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

avfilter/vf_unsharp: use av_freep() avoid leaving stale pointers in memory

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

avfilter/vf_uspp: Add grayscale support

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

avfilter/vf_uspp: assert that the qp_type is valid

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

doc: add FFREPORT example

And fix a few nits.

Signed-off-by: Lou Logan <lou@lrcd.com>

lavu/dict: check for malloc failures

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

avformat/utils: check for malloc failure

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

lavc/avpacket: check for malloc failure

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

Delete mp=uspp

avfilter/vf_spp: The qp array width is qp_stride not stride/16

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

avfilter/vf_spp: Allocate qp storage after qp_stride is known

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

avdevice/v4l2: use av_freep() to avoid leaving stale pointers in memory

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

avfilter/vf_spp: change temporary to unsigned

More consistent with uspp and allows for future 10bit support

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

avfilter/vf_uspp: fix integer overflow in intermediate

Fixes Ticket3596

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

avfilter/vf_uspp: remove YUV 411/422/440

snow doesnt support 422/411/440 currently, so these do not work yet

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

avfilter/vf_uspp: use the average QP instead of QP[0]

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

avfilter/vf_uspp: The qp array width is qp_stride not stride/16

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

avfilter/vf_uspp: Allocate qp storage after qp_stride is known

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

avfilter/version: bump for uspp

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

LICENSE: mention that uspp is GPL

build: add forgotten avcodec dependency in uspp

avfilter/uspp: use AVFILTER_DEFINE_CLASS()

avfilter/uspp: make src const in store_slice_c()

avfilter/uspp: misc style fixes

lavfi: USPP Filter

Previous version reviewed by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mov: Disable XMP metadata by default

This was suggested by cbsrobot, ubitux and koda

There are files with huge amounts of XMP data, which would otherwise
be displayed in the terminal output of FFmpeg

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

avcodec/libutvideoenc: Check avpicture_get_size() return code

Fixes CID1257656

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/libutvideoenc: fix leak of info array on error

Fixes CID1257657

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

compat/avisynth/avxsynth_c: Clear all unused fields in returned structs

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

avformat/avidec: Do not fail for crazy start times

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

avcodec/libxavs: fix division by 0 bitrate

Fixes CID1257655

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

avcodec/x86/hevc_mc: fix sse register counts

These fix failures of --enable-xmm-clobber-test
It would be better to change the code to use fewer registers, but until
someone does the used register count must not be too small

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

configure: do not allow nvenc to be build on cygwin to avoid _WIN32 definition hack

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

avcodec/hevc: Silence "warning: ref0/1 may be used uninitialized in this function"

Also make code more robust by initializing the pointers to NULL

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

doc: add loglevel numerical values

Useful for setting FFREPORT log level.

Signed-off-by: Lou Logan <lou@lrcd.com>

Merge commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae'

* commit 'e737a4aaafcb1d761b7f96043c2f83ce742c64ae':
  dashenc: Change the duration fields to 64 bit

Conflicts:
libavformat/dashenc.c

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

Merge commit 'c7921a480467876ece06566e0efd8f6bce9d1903'

* commit 'c7921a480467876ece06566e0efd8f6bce9d1903':
  libfdk-aacdec: Fix a boundary check

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

avcodec: Add NVENC encoder

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

avformat/hlsenc: added segment file deletion

This option flag deletes segment files removed from the playlist after a
period of time equal to the duration of the segment plus the duration of
the playlist.

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dashenc: Change the duration fields to 64 bit

For the last_duration field, it's mostly theoretical, but the
total_duration field more probably may need to actually be 64 bit.

Bug-Id: CID 1254944
Signed-off-by: Martin Storsjö <martin@martin.st>

libfdk-aacdec: Fix a boundary check

This avoids potential out of bounds writes, with potential future
versions of the library.

Bug-Id: CID 1254945
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

avcodec/hevc_refs: fix potential use of uninitialized min_idx

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

avformat/yuv4mpegdec: fix "warning: field_order may be used uninitialized in this function"

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

avformat/flvdec: fix potential use of uninitialized variables

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

avfilter/vf_perspective: add av_assert0() to help gcc see that there are no uninitialized variables

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

Merge commit '2c3f29c4894ee50635b846f202296ad79a7c0d33'

* commit '2c3f29c4894ee50635b846f202296ad79a7c0d33':
  xcbgrab: Support empty filename string correctly

Conflicts:
libavdevice/xcbgrab.c

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

avcodec/x86/hevc_mc: remove dead branch from EPEL_FILTER

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

avformat/avidec: Increase dshow_block_align use threshold by 1

Fixes 00.avi

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

xcbgrab: Support empty filename string correctly

Bug-Id: CID 1254664
CC: libav-stable@libav.org

Merge commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb'

* commit 'fa8934d6d6a0bb290010bdf16265c40b331d56fb':
  dashenc: log file output progress in verbose mode

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

Merge commit '95d880fa6436f3b557a9c060428a04b9e4d552df'

* commit '95d880fa6436f3b557a9c060428a04b9e4d552df':
  rtpproto: Fix the input RTP data format check

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

Merge commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747'

* commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747':
  fate: add dolby true hd tests

Conflicts:
tests/fate/lossless-audio.mak

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

Merge commit '4c81613df499ba81d64ea102b38d0c6686cc304c'

* commit '4c81613df499ba81d64ea102b38d0c6686cc304c':
  arm: mlpdsp: handle pic offset calculation in a macro

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

Merge commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9'

* commit '581c7f0e12b1fa39f73d683e54d6ecda0772c5a9':
  arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

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

dashenc: log file output progress in verbose mode

As the manifest/segments are flushed to disk, log to stderr the
progress, when in verbose logging mode

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

rtpproto: Fix the input RTP data format check

Only the upper 2 bits of the first byte are known to be
a fixed value.

The lower bits in the first byte of a RTP packet could be set
if the input is from another RTP packetizers than libavformat's,
but for RTCP packets, they would also be set when sending RTCP RR
packets, triggering false warnings about incorrect input format
to the protocol.

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

Allow mov musing if the ac3 parser was disabled.

This reverts 8091fe30.
Reported and tested by Takashi, ffmpeg-list dubistmeinheld de

fate: add dolby true hd tests

The existing meridian audio test does not test
ff_mlp_rematrix_channel_arm. This sample (first 640k of
https://samples.libav.org/A-codecs/TrueHD/TrueHD.raw) uses
ff_mlp_rematrix_channel_arm. Since this sample has 5.1 channels it also
allows testing the integrated downmixing.

arm: mlpdsp: handle pic offset calculation in a macro

Makes the code easier to read since it hides different offset
calculations for arm and thumb mode.

arm: make ff_mlp_filter_channel_arm and ff_mlp_rematrix_channel_arm position independent

No significant difference in used cpu cycles on a cortex-a9.

Merge commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5'

* commit 'fccfc22d1f304aef42a0b960e4c1d55ce67107f5':
  libavformat: Build hevc.o when building the RTP muxer

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

avformat/crypto: fix key vs iv typo

Fixes Ticket 4167

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

avformat/utils: change assert to av_assert0()

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

avformat/utils: replace impossible condition by av_assert0() in ff_gen_search()

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

avformat/wavenc: check return value of strftime()

Fixes CID1257006

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

libavformat: Build hevc.o when building the RTP muxer

The RTP muxer enables the actual codepaths within sdp.c,
which depend on hevc.o since e5cfc8fd.

This fixes builds with --disable-everything --enable-muxer=rtp.

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

Merge commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793'

* commit '780cd20b00a69e26bbfffbb8eec16fbe999ea793':
  aarch64: Use .data.rel.ro for const data with relocations

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

Merge commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46'

* commit 'f963f80399deb1a2b44c1bac3af7123e8a0c9e46':
  arm: Use .data.rel.ro for const data with relocations

Conflicts:
configure

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

Merge commit '3c01039e0bc7d269900e15551f8171c4328a0223'

* commit '3c01039e0bc7d269900e15551f8171c4328a0223':
  mov: further expand the list of parsed metadata tags

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

aarch64: Use .data.rel.ro for const data with relocations

This reverts commit c00365b46d464ce47716315c1801818d811bdb9a
in addition to using a different section.

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

arm: Use .data.rel.ro for const data with relocations

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

avformat/utils: fix calculating the absolute difference of timestamps

we dont use FFABS(a-b) as that could result in undefined behavior if it overflows

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

ffserver_config: reflow add_codec()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>