Merge commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22'

* commit 'bab8d73765238bfeea7a8dfd454f40ac213b3d22':
  vaapi: wrap codec specific functions in appropiate #ifs

Conflicts:
libavcodec/vaapi.c

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

Merge commit '5a82ad644f281701eb22e0359fd732fac67aafa4'

* commit '5a82ad644f281701eb22e0359fd732fac67aafa4':
  svq1dec: Unbreak the scratch buffer allocation

Conflicts:
libavcodec/svq1dec.c

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

Merge commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06'

* commit 'bcbdeb318e0828cf00b458885ffa1e1596c85d06':
  asvenc: Forward the error instead of asserting on it

Conflicts:
libavcodec/asvenc.c

Not merged, conditions which are impossible should be checked by assert*()
adding impossible to be true error checks has the potential to confuse

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

lavu/frame: fix malloc error path in av_frame_copy_props()

The error path frees all side data, but forgets to reset the side data
count. This can blow up later in av_frame_unref() and free_side_data().

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

configure: Set the default for --shlibdir to --libdir.

Fixes ticket #4183.

Reviewed-by: Ivan Kalvachev

vp9/x86: sse2 MC assembly.

Also a slight change to the ssse3 code, which prevents a theoretical
overflow in the sharp filter.

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

lavf/mxfdec: Fix memleaks reading corrupt files.

Fixes ticket #4173.

Reviewed-by: Tomas Härdin

lavf/mxfdec: Factorize mxf_read_close().

This will allow to fix leaks in a subsequent commit.

vp9/x86: 32bit and sse2 support for vp9 inverse transform assembly

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

avformat/dv: Use av_freep() to avoid leaving stale pointers in memory

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

cmdutils: use macros for device test

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavd/alsa-audio-common: mark default device in device list

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

lavd/avdevice: use better option types for caps options

Using dedicated types allows to use format/layout names,
not just raw int values.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>

Merge commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d'

* commit 'fd665f7f48fa7db89eb9a93ac33919f6adc40f9d':
  avconv: Use the mpeg12 private option scan_offset

Conflicts:
ffmpeg_opt.c

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

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>

vaapi: wrap codec specific functions in appropiate #ifs

Fix linking when only a subset of vaapi decoders is enabled.

Bug-Id: 760
CC: libav-stable@libav.org
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

svq1dec: Unbreak the scratch buffer allocation

The input packets are always assumed to be padded and
the av_fast_ family of function takes a pointer to a pointer.

Thanks to Nicolas Dufresne <nicolas.dufresne@collabora.com> for
a similar patch.

Introduced in 7b588bb691644e1b3c168b99accf74248a24e3cf.

Bug-Id: 766
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

asvenc: Forward the error instead of asserting on it

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

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>

avconv: Use the mpeg12 private option scan_offset

Introduced in aed790070486b1b01b48106310d9d0ca1730e459

Bug-Id: debian/773055
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

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>