Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'

* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
  mpegts: Support HEVC demuxing

Conflicts:
Changelog
libavformat/version.h

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

Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'

* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
  matroskadec: Support HEVC demuxing

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

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

Merge commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7'

* commit 'ea29f965dc71182f77b8efe819630f55e48b0ab7':
  mov: Support HEVC demuxing

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

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

Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'

* commit '5846646296e377e093441dfe9eadde38ff1f7c99':
  Add raw HEVC demuxer

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

See: 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc'

* commit 'e1c058dba930c1f6f180e04d9e26dbda261cedbc':
  FATE: Add HEVC tests

Conflicts:
tests/fate/hevc.mak
tests/ref/fate/hevc-conformance-DBLK_A_SONY_3
tests/ref/fate/hevc-conformance-DBLK_B_SONY_3
tests/ref/fate/hevc-conformance-DBLK_C_SONY_3
tests/ref/fate/hevc-conformance-DELTAQP_B_SONY_3
tests/ref/fate/hevc-conformance-DELTAQP_C_SONY_3
tests/ref/fate/hevc-conformance-POC_A_Bossen_3
tests/ref/fate/hevc-conformance-RPS_D_ericsson_5
tests/ref/fate/hevc-conformance-WP_B_Toshiba_3
tests/ref/fate/hevc-conformance-WP_MAIN10_B_Toshiba_3

See: fb3cea4be339f4544ca37fb0bc917d734d063a1f and later commits
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942'

* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
  Add HEVC decoder

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/hevc.c
libavcodec/hevc.h
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_parser.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevc_sei.c
libavcodec/hevcdsp.c
libavcodec/hevcdsp_template.c
libavcodec/hevcpred.c
libavcodec/hevcpred_template.c
libavcodec/version.h

cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.

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

lavd/xv: free graphics context

Valgrind detects mem leak from XCreateGC.
Free it with XFreeGC.

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

Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb'

* commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb':
  webp: stop using deprecated avcodec_set_dimensions

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

Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be'

* commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be':
  vp8: stop using deprecated avcodec_set_dimensions
  vp56: stop using deprecated avcodec_set_dimensions
  vp3: stop using deprecated avcodec_set_dimensions
  txd: stop using deprecated avcodec_set_dimensions
  truemotion1: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/txd.c
libavcodec/vp56.c

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

Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d'

* commit 'c265b8bb7638546919465e3585441b1d40c4b13d':
  tiff: stop using deprecated avcodec_set_dimensions
  targa: stop using deprecated avcodec_set_dimensions
  svq1dec: stop using deprecated avcodec_set_dimensions
  sunrast: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/sunrast.c
libavcodec/targa.c

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

Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'

* commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934':
  sgidec: stop using deprecated avcodec_set_dimensions
  rv34: stop using deprecated avcodec_set_dimensions
  rv10: stop using deprecated avcodec_set_dimensions
  ptx: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/ptx.c
libavcodec/rv10.c
libavcodec/sgidec.c

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

Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d'

* commit '0f21d8b1b40848973558c737aebe800c46e93a3d':
  pictordec: stop using deprecated avcodec_set_dimensions
  pgssubdec: stop using deprecated avcodec_set_dimensions
  pcx: stop using deprecated avcodec_set_dimensions
  mpegvideo_parser: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/pcx.c
libavcodec/pgssubdec.c
libavcodec/pictordec.c

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

Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'

* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
  mpeg4video_parser: stop using deprecated avcodec_set_dimensions
  mpeg12dec: stop using deprecated avcodec_set_dimensions
  mjpegdec: stop using deprecated avcodec_set_dimensions
  libvpxdec: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4video_parser.c

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

Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e'

* commit '967cd6fafbf2fdec9cbe011296ad34a70212427e':
  libopenjpegdec: stop using deprecated avcodec_set_dimensions
  kgv1dec: stop using deprecated avcodec_set_dimensions
  ivi_common: stop using deprecated avcodec_set_dimensions
  indeo3: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/ivi_common.c
libavcodec/kgv1dec.c
libavcodec/libopenjpegdec.c

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

Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6'

* commit '3b086317277e3f3b61c0343930d8e2570b278bd6':
  h26[13]dec: stop using deprecated avcodec_set_dimensions
  gifdec: stop using deprecated avcodec_set_dimensions
  g2meet: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/gifdec.c

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

avfilter/vf_gradfun: add emms_c() for mmxext

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

Revert "Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'"

This reverts commit fc5fe4804fd2ee9a29de502e9431b12d027c0c89, reversing
changes made to ffe33500983983946048def3a6047920d97d957b.

The factoring is broken; it's not calling the ssse3 code anymore, and
calling the mmx2 code with bad alignment. It also broke some FATE
instances.

Conflicts:
libavfilter/x86/vf_gradfun_init.c

avfilter/x86/vf_gradfun_init: fix some consts & related warnings

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

Merge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8'

* commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8':
  eatqi: stop using deprecated avcodec_set_dimensions
  eatgv: stop using deprecated avcodec_set_dimensions
  eatgq: stop using deprecated avcodec_set_dimensions
  eamad: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/eamad.c

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

Merge commit 'd6da372984c87fd6288c148c291065d6032ceda3'

* commit 'd6da372984c87fd6288c148c291065d6032ceda3':
  eacmv: stop using deprecated avcodec_set_dimensions
  dvdsubdec: stop using deprecated avcodec_set_dimensions
  dvdec: stop using deprecated avcodec_set_dimensions
  dpx: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/eacmv.c

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

Merge commit 'c7a5acabc537c2ce363165c31250aba341b1a990'

* commit 'c7a5acabc537c2ce363165c31250aba341b1a990':
  dnxhddec: stop using deprecated avcodec_set_dimensions
  dirac: stop using deprecated avcodec_set_dimensions
  cdxl: stop using deprecated avcodec_set_dimensions
  avs: stop using deprecated avcodec_set_dimensions

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

Merge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5'

* commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5':
  ansi: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/ansi.c

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

Merge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213'

* commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213':
  lavc/utils: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/utils.c

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

Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720'

* commit 'ce6949d3a0607eb318dc2872553110df934e9720':
  oggparsetheora: stop using deprecated avcodec_set_dimensions

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

Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18'

* commit '7644f5a80787c9b608b82873604805d7e38a6a18':
  lavc: replace avcodec_set_dimensions with ff_set_dimensions

Conflicts:
libavcodec/utils.c

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

h264: simplify frame_recovered code

This is a separate commit to ease future bisecting in case it breaks something.

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

Merge commit '28096e0a806e57376541e6222d315619906e3c55'

* commit '28096e0a806e57376541e6222d315619906e3c55':
  h264: wait for initial complete frame before outputing frames

Conflicts:
doc/APIchanges
libavcodec/h264.c
libavcodec/mpegvideo.h
libavutil/frame.h
libavutil/version.h

See: a64b028aeb6579636e578ceb73f69b468bddb2f0 (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>

doc/encoders: add libfaac encoder documentation

doc/encoders: document the libfdk-aac wrapper

Partially based on the https://trac.ffmpeg.org/wiki/AACEncodingGuide
guide.

doc/encoders: extend/clarify libtheora encoder documentation

Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/version.h

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

Merge commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191'

* commit 'ed1a11ed52bbd1f15bb9b0416d69b7924bee3191':
  gradfun: x86: Factor out common code for some gradfun_filter_line() variants

Conflicts:
libavfilter/x86/vf_gradfun_init.c

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

Merge commit 'ee80cf741a44115758e62399b7bde08d33161151'

* commit 'ee80cf741a44115758e62399b7bde08d33161151':
  avfilter: x86: K&R formatting cosmetics

Conflicts:
libavfilter/x86/vf_gradfun_init.c

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

avcodec/wmv2enc: Collect statistics for 2 pass encoding

Fixes Ticket3053

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

MAINTAINERS: add myself as libzvbi-teletextdec maintainer

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

aacdec: fix small comment, update decoder features comment

mpegts: Support HEVC demuxing

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

matroskadec: Support HEVC demuxing

mov: Support HEVC demuxing

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

Add raw HEVC demuxer

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

FATE: Add HEVC tests

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

Add HEVC decoder

Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC
project. Further contributions by the OpenHEVC project and other
developers, namely:

Mickaël Raulet <mraulet@insa-rennes.fr>
Seppo Tomperi <seppo.tomperi@vtt.fi>
Gildas Cocherel <gildas.cocherel@laposte.net>
Khaled Jerbi <khaled_jerbi@yahoo.fr>
Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr>
Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström <jeebjp@gmail.com>
Anton Khirnov <anton@khirnov.net>
Martin Storsjö <martin@martin.st>
Luca Barbato <lu_zero@gentoo.org>
Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun <diego@biurrun.de>

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

Fix a crash on oom when decoding hevc.

webp: stop using deprecated avcodec_set_dimensions

vp8: stop using deprecated avcodec_set_dimensions

tiff: stop using deprecated avcodec_set_dimensions

sgidec: stop using deprecated avcodec_set_dimensions

pictordec: stop using deprecated avcodec_set_dimensions

vp56: stop using deprecated avcodec_set_dimensions

targa: stop using deprecated avcodec_set_dimensions

rv34: stop using deprecated avcodec_set_dimensions

pgssubdec: stop using deprecated avcodec_set_dimensions

vp3: stop using deprecated avcodec_set_dimensions

svq1dec: stop using deprecated avcodec_set_dimensions

rv10: stop using deprecated avcodec_set_dimensions

pcx: stop using deprecated avcodec_set_dimensions

txd: stop using deprecated avcodec_set_dimensions

sunrast: stop using deprecated avcodec_set_dimensions

ptx: stop using deprecated avcodec_set_dimensions

mpegvideo_parser: stop using deprecated avcodec_set_dimensions

truemotion1: stop using deprecated avcodec_set_dimensions

mpeg4video_parser: stop using deprecated avcodec_set_dimensions

libopenjpegdec: stop using deprecated avcodec_set_dimensions

h26[13]dec: stop using deprecated avcodec_set_dimensions

eatqi: stop using deprecated avcodec_set_dimensions

eacmv: stop using deprecated avcodec_set_dimensions

dnxhddec: stop using deprecated avcodec_set_dimensions

mpeg12dec: stop using deprecated avcodec_set_dimensions

kgv1dec: stop using deprecated avcodec_set_dimensions

gifdec: stop using deprecated avcodec_set_dimensions

eatgv: stop using deprecated avcodec_set_dimensions

dvdsubdec: stop using deprecated avcodec_set_dimensions

dirac: stop using deprecated avcodec_set_dimensions

mjpegdec: stop using deprecated avcodec_set_dimensions

ivi_common: stop using deprecated avcodec_set_dimensions

g2meet: stop using deprecated avcodec_set_dimensions

eatgq: stop using deprecated avcodec_set_dimensions

dvdec: stop using deprecated avcodec_set_dimensions

libvpxdec: stop using deprecated avcodec_set_dimensions

indeo3: stop using deprecated avcodec_set_dimensions

eamad: stop using deprecated avcodec_set_dimensions

dpx: stop using deprecated avcodec_set_dimensions

ansi: stop using deprecated avcodec_set_dimensions

lavc/utils: stop using deprecated avcodec_set_dimensions

oggparsetheora: stop using deprecated avcodec_set_dimensions

lavc: replace avcodec_set_dimensions with ff_set_dimensions

avcodec_set_dimensions() is supposed to be an internal utility function,
there is no reason whatsoever for it to be public. Therefore deprecate
it.

h264: wait for initial complete frame before outputing frames

This can be optionally disabled whith the "output_corrupt" flags
option.  When in "output_corrupt" mode, incomplete frames are
signalled through AVFrame.flags FRAME_FLAG_INCOMPLETE_FRAME.

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

cdxl: stop using deprecated avcodec_set_dimensions

avs: stop using deprecated avcodec_set_dimensions

HNM4/HNM4A demuxer & video decoder

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

gradfun: x86: Factor out common code for some gradfun_filter_line() variants

doc/filters: add few more examples for blend filter

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  libavfilter/decimate: Add pts of first frame to all frames.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: Ensure that strip commands are run silently

Conflicts:
Makefile

Not merged as it conflicts with strip being on the BRIEF list

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

avfilter: x86: K&R formatting cosmetics

build: Ensure that strip commands are run silently

libavfilter/decimate: Add pts of first frame to all frames.

Fixes ticket #3019

Reviewed-by: Clément Bœsch

avcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0

Fixes overreads in HEVC
Fixes Ticket3070
Also fixed remaining issues from Ticket3075 and Ticket3076

Some lines of code taken from  0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/x86/cabac.h
and                            0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/cabac_functions.h

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

hevc: add partial support for interlaced(cherry picked from commit 44b592ae6d323445c076ef3ec966ebf9daa8bccf)

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

avformat/thp: force moving forward

Fixes infinite loop
Fixes Ticket3098

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