Merge commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c'

* commit 'c487972ed0e1eaebdbe4a13cdd191e119be0b19c':
  ismindex: recover from completely empty streams

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

Merge commit '95e177eeb21f3e968aa9353bc69d1946966cc835'

* commit '95e177eeb21f3e968aa9353bc69d1946966cc835':
  rtpdec: HEVC/H.265 support

Conflicts:
Changelog
libavformat/rtpdec_hevc.c
libavformat/version.h

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

Merge commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305'

* commit 'ebef9f5a56d7df91e010a177a80cfc8dbe394305':
  time: Use clock_gettime if the monotonic clock is available

Conflicts:
configure

The change to av_gettime() isnt merged, a patch will be posted to the mailing list
that would do the switch

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

Merge commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d'

* commit '65e78a2e4b111627c0ebdf2c9baec95e5e21560d':
  x11grab: Refactor pixel format parsing

Conflicts:
libavdevice/x11grab.c

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

Merge commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc'

* commit 'bb3ead7e54fec205c595cfb8b1d8900d50d3d1cc':
  x11grab: Fallback to normal XImage if SHM is not supported

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

Merge commit 'c19a49e565bd06ea47947d50779ba236df9d4943'

* commit 'c19a49e565bd06ea47947d50779ba236df9d4943':
  ppc: Support little endian intreadwrite

Conflicts:
libavutil/ppc/intreadwrite.h

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

avformat/mpegts: Change order of structs to match 7968059e5c3cd8f91407f379c11bbf71a1b84c74

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

Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'

* commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74':
  mpegts: Allow custom max resync size

Conflicts:
libavformat/mpegts.c

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

Merge commit '94f084324e648876508bed546d950762f10b875e'

* commit '94f084324e648876508bed546d950762f10b875e':
  texi2pod: Make it output a single encoding string

Conflicts:
doc/texi2pod.pl

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

Merge commit '4912b634b517c8acfc476c5d47f10be83fe7e18b'

* commit '4912b634b517c8acfc476c5d47f10be83fe7e18b':
  x265: Use the encoder defaults

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

ismindex: recover from completely empty streams

This creates best-effort results from input that is missing stream
contents, there are warnings printed when this happens.

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

avcodec/idctdsp: Initialize ff_put/add_pixels_clamped correctly so that the optimized functions are also used

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

avcodec/mpeg4videodec: fix automatic use of the xvid idct on non x86

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

Merge commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce'

* commit 'eda7571ea1a41c835e3a02fa9517e5bc67d7adce':
  wmv2: K&R formatting cosmetics

Conflicts:
libavcodec/wmv2.c
libavcodec/wmv2dec.c
libavcodec/wmv2enc.c

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

Merge commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453'

* commit '7a1d6ddd2c6b2d66fbc1afa584cf506930a26453':
  xvid: Add C IDCT

Conflicts:
libavcodec/dct-test.c
libavcodec/xvididct.c

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

Merge commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b'

* commit '95c0cec03acec0a80cc1c7db48f3b2355d9e767b':
  idctdsp: Add global function pointers for {add|put}_pixels_clamped functions

Conflicts:
libavcodec/arm/idctdsp_init_arm.c
libavcodec/dct.h
libavcodec/idctdsp.c
libavcodec/jrevdct.c

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

rtpdec: HEVC/H.265 support

As specified in draft-ietf-payload-rtp-h265-06.

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

time: Use clock_gettime if the monotonic clock is available

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

x11grab: Refactor pixel format parsing

x11grab: Fallback to normal XImage if SHM is not supported

ppc: Support little endian intreadwrite

mpegts: Allow custom max resync size

texi2pod: Make it output a single encoding string

Intermixing =encoding utf-8 in the file can confuse some pod2man
implementations.

x265: Use the encoder defaults

Reset the settings as it is done for x264.

wmv2: K&R formatting cosmetics

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

xvid: Add C IDCT

Thanks to Pascal Massimino and Michael Militzer for relicensing as LGPL.

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

idctdsp: Add global function pointers for {add|put}_pixels_clamped functions

These function pointers already existed in the ARM code. Adding them globally
allows calls to the function pointers to access arch-optimized versions of the
functions transparently.

Merge commit '91d305790ea0f6fe0f54b48236da42181c39c18b'

* commit '91d305790ea0f6fe0f54b48236da42181c39c18b':
  get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE

Conflicts:
libavcodec/golomb.h

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

Merge commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef'

* commit 'ff4d1aa8bc3f4fe9d1f684f760b29c51adb569ef':
  flv: K&R formatting cosmetics

Conflicts:
libavcodec/flv.h
libavcodec/flvdec.c
libavcodec/flvenc.c

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

Merge commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67'

* commit 'f61e47dd68582529bcf6d42d861c70a320cd1b67':
  asv: K&R formatting cosmetics

Conflicts:
libavcodec/asvdec.c
libavcodec/asvenc.c

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

Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'

* commit '74512f7e369da40e1148c92b58cd8e59f7737b8f':
  8svx: Return proper error codes

Conflicts:
libavcodec/8svx.c

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

vf_deshake: Avoid doing a malloc+free for every single frame.

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

vf_deshake: reduce stack usage.

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

rangecoder-test: Allow running with small stack size.

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

rl.h: Use on-stack temporary VLC tables instead of having them static.

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

rl.h: remove deprecated and now unused vlc member.

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

cmdutils: Add some whitespace when printing layouts

Adds some more whitespace between channel layout name and decomposition.

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

avformat/swfdec: Use side data to communicate w/h changes to the decoder

Fixes reading from freed data
Fixes part of Ticket3539

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

avcodec/rawdec: Support CODEC_CAP_PARAM_CHANGE

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

get_bits: Rename HAVE_BITS_REMAINING --> BITS_AVAILABLE

The HAVE_ prefix is reserved for macros set by configure.

flv: K&R formatting cosmetics

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

asv: K&R formatting cosmetics

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

8svx: Return proper error codes

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

segment: fix copying stream metadata

To get mpegts metadata copied when segmenting.

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

segment: use mpegts_flags instead of the deprecated resend_headers option

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

avformat/segment: Use avformat_alloc_output_context2()

This avoids having to assign oformat, allows returning the
correct error code and allocates priv_data

Based on patch by: Mika Raento <mika.raento@elisa.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Support decoding of ImageJ png in avi.

Fixes ticket #3916.

segment: don't access outside seg->frames array

Fixes wrong number of segments output and undefined memory access.

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

Merge commit 'e48d1ea541be4592ebac89875557407ca958b7a9'

* commit 'e48d1ea541be4592ebac89875557407ca958b7a9':
  ismindex: improve diagnostics

Conflicts:
tools/ismindex.c

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

ismindex: improve diagnostics

This improves error messages for completely and somewhat broken inputs.

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

tools/normalize.py: both input and output file names are required

avutil/pixelutils: add small buffers tests

build sys: enable the decoding_encoding example under the ffmpeg/doc/examples

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

Fix standalone compilation of the snow decoder.

doc/filters.texi: fix filter name in examples

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

Add missing changelog entry

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

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>