Merge commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5'

* commit 'e205fe6831fe1b5445f7827b5c916425620b4ab5':
  mpeg4videodec: Fix low_delay error message

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

Merge commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2'

* commit '63f800ca5f4f6b38f3789a7edb03bfabe8bacdd2':
  aac_adtstoasc_bsf: Return proper error code

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

Merge commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae'

* commit 'b8962d64cc71af241601bcab5c3fcdc5735ef4ae':
  dxva2: Clean up definition of _WIN32_WINNT

Conflicts:
libavcodec/dxva2.h

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

Merge commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098'

* commit '4600a85eaa6182e5a27464f6b9cae5a9ddbf3098':
  dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()

Conflicts:
libavcodec/dxva2_h264.c
libavcodec/dxva2_mpeg2.c
libavcodec/dxva2_vc1.c

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

ffmpeg: Enable compute_edt only when the subtitles are used for a output stream instead of a filter

Fixes/works around Ticket3768

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/dvbsubdec: make compute_edt user settable

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

h261dec, ituh263dec: Move condition.

Stops compiler from doing incredibly stupid things.
With vsynth1-flv inner loop goes from 3501 to 3275
decicycles.

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

h261dec, ituh263dec: ensure CLOSE_READER is done on error paths, too.

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

h261dec, ituh263dec: Avoid unnecessary -1 inside inner loop.

3646 -> 3597 decicycles in inner loop when decoding
vsynth1-flv.

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

general: Fix usage of @float

makeinfo chokes on that.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mpeg4videodec: Fix low_delay error message

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

aac_adtstoasc_bsf: Return proper error code

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

dxva2: Clean up definition of _WIN32_WINNT

Only set a value if _WIN32_WINNT is undefined or smaller than 0x0600. This is
cleaner than unconditional definition and avoids a number of redefinition
warnings. Also only define a value in one of the two dxva2 headers.

dxva2: Pass variable of correct type to IDirectXVideoDecoder_GetBuffer()

This avoids related incompatible pointer type warnings.

RELEASE_NOTES: mention libmodplug detection change

lavu/avstring: check for overlong encodings in av_utf8_decode()

Fix reopened trac ticket #1163.

build: use pkg-config to detect libmodplug

Fix static build, at least for OSX.

Merge commit '37c46743ee42df1d6986ba3c996e3af5b95511f7'

* commit '37c46743ee42df1d6986ba3c996e3af5b95511f7':
  avcodec: fix missing doxygen comment marker

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

avformat/mpegts: favor DESC_types over probed codecs

Fixes Ticket3766
Fixes dvb_teletext detection

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

avcodec: fix missing doxygen comment marker

ffserver: tests, use image2 instead of pgmyuv

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

ituh263dec: Optimize new RL_VLC based decoding.

Together with the switch to RL_VLC this results in
a speedup of about 30% in this inner loop.
Overall speedup only relevant for medium to high bitrate
streams.

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

h261dec: Optimize new RL_VLC based decoding.

Together with the switch to RL_VLC this results in about
10% speedup for this inner loop.

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

h261, h263 decoders: convert to RL_VLC.

Some additional optimizations in following patch.

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

aacps_tablegen: replace TABLE_CONST by const.

Doesn't change generated code, just is more consistent
and a bit less error-prone.

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

intmath.h: Remove duplicated ARM include.

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

avcodec/mjpegdec: fix green line at the bottom with upscale v

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

avcodec/mjpegdec: fix green vertical line at the right with upscale h

Fixes Ticket3891

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

vf_drawtext: move "static const" before "struct".

This is consistent with all other occurrences.

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

lavu/hash.c: Add missing "static const".

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

Add av_cold to table generation functions.

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

WMA: add "const" to avoid warnings with hardcoded tables.

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

ac3dec_fixed: add missing "static const".

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

lavfi: add const/static const to pix_fmts arrays.

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

sipr16kdata.h: add forgotten const.

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

fft_template: Move variables to where they are used.

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

fft: add ff_ prefix to some global arrays.

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

avcodec/h264: Do not get stuck on IDR inter frames

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

xv.c: Add missing const to lookup table.

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

avformat/dfa: use avio_feof()

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

oggdec: fix invalid free on error

The read_packet callback passes a pointer to a stack-allocated AVPacket.
Attempting to free it with av_free() makes no sense.

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

fft: add missing const.

This table was the largest object in FFmpeg's .data,
and really should be in .rodata.

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
  ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

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

proresenc_ks: allow auto-selecting profile

The user may not know how to select the profile, nor what he needs, in
particular to encode alpha.

Therefore, use an automatic selection as default, and warn when the
manually selected profile may cause issues.

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

avcodec/vp3data: use more compact data types

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

lavf/rtpdec_hevc: Fix compilation with -DDEBUG.

ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

Fixes ticket #3858.

Reviewed-by: Nicolas George

avcodec/aarch64/h264qpel_init_aarch64: mark src as const

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

avformat/udp: Move variables used only with HAVE_PTHREAD_CANCEL, under the #if

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

avformat/id3v2: Fix "warning: unused variable uncompressed_buffer_size" if zlib is unavailable

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

avfilter/vf_mp: remove incorrect usage of AVFrame.type

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

avcodec/snow: check coeffs for validity

Fixes deadlock
Fixes integer overflow
Fixes Ticket 3892

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

Add missing "const" all over the place.

Only "./configure --enable-gpl" on x86 was tested.

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

patcheck: check for pointer arrays that are not const.

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

avformat/wtvdec: seek over broken chunks

Fixes ticket #3898

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/webmdashenc: use av_strlcpy() and allocate enough space

Fixes out of array read

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

fate/vpx: make webm dash manifest tests depend on the WEBM_DASH_MANIFEST demuxer

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

avcodec/wavpack: increase WV_MAX_SAMPLES

This is maximal number of samples per frame that current wavpack
can create.

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

fate: Add basic tests for WebM Dash Manifest

Add fate tests that test out the functionality of WebM DASH
Manifest XML generation. This patch contains the vpx.mak file
changes and the reference gold XML files.

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

avcodec/avcodec: fix missing doxygen comment marker

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

avformat: drop redundant MATROSKA_VIDEO_STEREO_MODE_COUNT identifier

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

Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'

* commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5':
  license: Mention that vf_interlace is GPL, not LGPL

Conflicts:
LICENSE.md

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

Merge commit '4d686fb721b485ebbc4c7779d927d876c1e630f7'

* commit '4d686fb721b485ebbc4c7779d927d876c1e630f7':
  matroskaenc: convert avstream stereo3d side data during encoding

Conflicts:
libavformat/matroskaenc.c

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

Merge commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f'

* commit 'd4ae8ac92f619507aadd021bb67b517d39d3a36f':
  matroskadec: parse stereo mode on decoding

Conflicts:
Changelog
libavformat/matroska.c
libavformat/matroskadec.c

See: 4c509fe305bc79a913ef1b690df6c910c732f608 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>

ffmpeg: Fix missing {} in Stream to Packet side data code

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

Merge commit '9301486408a480629336af4d7fd873c0f28fb2d5'

* commit '9301486408a480629336af4d7fd873c0f28fb2d5':
  avcodec: add stream-level stereo3d side data

Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/utils.c
libavcodec/version.h

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

Merge commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef'

* commit 'f2583bc86eb5d7decc639fc9a36edc93e6003eef':
  matroska: list supported extensions

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

Merge commit '58396e806c65fe0eb00e6ccf1980f810cdceed05'

* commit '58396e806c65fe0eb00e6ccf1980f810cdceed05':
  x11grab: Use a typedef for the context, as most other code does

Conflicts:
libavdevice/x11grab.c

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

Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'

* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
  x11grab: Drop a spurious space in the extension reporting message

Conflicts:
libavdevice/x11grab.c

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

Merge commit '20e82b41fcad23ebbb18d89948aebfcc53921198'

* commit '20e82b41fcad23ebbb18d89948aebfcc53921198':
  x11grab: Small near-cosmetic refactorings

Conflicts:
libavdevice/x11grab.c

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

Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'

* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
  x11grab: K&R formatting cosmetics

Conflicts:
libavdevice/x11grab.c

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

license: Mention that vf_interlace is GPL, not LGPL

matroskaenc: convert avstream stereo3d side data during encoding

Write the StereoMode Embl to bitstream.

matroskadec: parse stereo mode on decoding

Convert the Matroska stereo format to the Stereo3D format, and add a
Stereo3D side data to the stream.

Bump the doctype version supported.

Bug-Id: 728 / https://bugs.debian.org/757185

avcodec: add stream-level stereo3d side data

matroska: list supported extensions

avformat/soxenc: return more meaningful error code

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

avcodec/h264: Move h264_vdpau_class under ifdef to avoid unused variable warning

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

avcodec/flashsv2enc: fix "unused variable" warnings

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

x11grab: Use a typedef for the context, as most other code does

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

x11grab: Drop a spurious space in the extension reporting message

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

avcodec/libvpxenc: Adds support for constant quality mode in VP9.

Changes in the parameter mapping for libvpx to support the constant
quality mode in VP9. The assumption in the patch is that if crf is
provided but bitrate is 0, then the 'constant quality' mode of VP9
is used. However if both are present, the 'constrained quality' mode
is used as before.

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

x11grab: Small near-cosmetic refactorings

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

x11grab: K&R formatting cosmetics

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

avformat/icoenc: Remove deprecated use of codec_name

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

doc/ffprobe: fix -show_entries example

Adds support for setting aq_mode in libvpx encoder

Reviewed-by: James Zern <jzern@google.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Replace incorrect use of "multiply" with "multiple"

Also replace the plural form "multiplies" with "multiples".

avformat/rtpdec_asf: fix compiler warning about const qualifier being discarded

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

avformat/rdt: fix compiler warning about const qualifier being discarded

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

avformat/aviobuf: remove uses of deprecated url_feof()

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

Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'

* commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc':
  x86: xvid: K&R formatting cosmetics

Conflicts:
libavcodec/x86/xvididct_sse2.c

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

Merge commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5'

* commit 'dcb7c868ec7af7d3a138b3254ef2e08f074d8ec5':
  cosmetics: Make naming scheme of Xvid IDCT consistent with other IDCTs

Conflicts:
libavcodec/mpeg4videodec.c
libavcodec/x86/Makefile
libavcodec/x86/dct-test.c
libavcodec/x86/xvididct_sse2.c
libavcodec/xvididct.c

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

Merge commit '1f156af4274dc72d588620f6bedb4e9e66023c92'

* commit '1f156af4274dc72d588620f6bedb4e9e66023c92':
  x86: xvid_idct: Drop unused definitions

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

Merge commit '404731bd20e1df5880e6fe381e975ba48afc75b2'

* commit '404731bd20e1df5880e6fe381e975ba48afc75b2':
  pulse: Set the wallclock option as default

Conflicts:
libavdevice/pulse_audio_dec.c

No change, the option was already default in FFmpeg since a long time

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

Merge commit 'ff771f79b55a346b4163d814b58ee4c98114745e'

* commit 'ff771f79b55a346b4163d814b58ee4c98114745e':
  vc1: Initialize start_code_found to 0

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

lavc/libwebpenc: use WebPMemoryWriterClear()

WebPMemoryWriterClear() must be used instead of free() when libwebp ABI version is > 0x0203

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

swr: aarch64 audio_convert and neon clobber test

Ported from avresample
Code by:  Mans Rullgard, Janne Grunau, Martin Storsjo

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

bktr: Fix Fabrice's name

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
This file with the incorrect name was added after the name was fixed in all other files.
This is thus fixing a mistake

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

lavf/mp3enc: don't abort if audio packets can't be buffered

Instead skip the picture streams and flush the queued audio packets.
Should address ticket #3851.

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