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

Fix a crash on oom when decoding hevc.

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>

avformat/thp: fix variable types to avoid overflows

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

avformat/http: fix cookies

Fixes Ticket3096

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

avcodec/bink: fix seeking to frame 0

Fixes Ticket3088

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

avcodec/jpeglsdec: check err value for ls_get_code_runterm()

Fixes infinite loop
Fixes Ticket3086

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

Optimize pure C unscaled yuv2rgb.

Aligning the tables reduces the amount of code generated on
e.g. ARM as the offset constant then has few enough set bits
so it can be encoded inside a single instruction instead of 2.
Ideally all should be declared aligned, but the DECLARE_ALIGNED
macros does not work with pointer tables, thus also reordered
the tables.

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

avcodec/mpeg12dec: Use skip_1stop_8data_bits()

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

avcodec/vaapi_mpeg2: Use skip_1stop_8data_bits()

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

avcodec/svq3: Use skip_1stop_8data_bits()

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

avcodec/svq1dec: Use skip_1stop_8data_bits()

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

avcodec/ituh263dec: Use skip_1stop_8data_bits()

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

avcodec/intelh263dec: Use skip_1stop_8data_bits()

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

avcodec/h261dec: Use skip_1stop_8data_bits()

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

avcodec/flvdec: Use skip_1stop_8data_bits()

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

avcodec/dxva2_mpeg2: Use skip_1stop_8data_bits()

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

avcodec/get_bits: add skip_1stop_8data_bits

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: Remove a now useless parameter to ffurl_register_protocol

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

avcodec/intelh263dec: make while get_bits loop more robust by checking bits left

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

avcodec/ituh263dec: make while get_bits loop more robust by checking bits left

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

avcodec/ivi_common: make while get_bits loop more robust by checking bits left

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

avcodec/flacdec: use get_unary() simplify code

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

avcodec/h261dec: make while get_bits loop more robust by checking bits left

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

avcodec/flvdec: make while get_bits loop more robust by checking bits left

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

avcodec/flacdec: make while get_bits loop more robust by checking bits left

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

doc/examples/demuxing: reset got_frame.

Fix infinite loop at flushing.

avcodec/cook: fix deadlock by using get_unary()

Fixes #3089.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>

avcodec/mdec: use dsp.bswap16_buf()

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

avcodec/svq3: use av_fast_padded_malloc()

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

avcodec/utvideoenc: use av_fast_padded_malloc()

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

avcodec/wavpack: use init_get_bits8()

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

avcodec/apedec: use init_get_bits8()

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

avcodec/xan: use init_get_bits8()

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

avcodec/binkaudio: use init_get_bits8()

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

avcodec/4xm: use av_fast_padded_malloc()

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

avcodec/mdec: use av_fast_padded_malloc()

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

avcodec/motionpixels: use av_fast_padded_malloc()

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  oggparsetheora: check av_mallocz result

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

Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'

* commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d':
  oggparsetheora: return meaningful error codes

Conflicts:
libavformat/oggparsetheora.c

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

Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'

* commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68':
  oggparsetheora: K&R cosmetics, reformat

Conflicts:
libavformat/oggparsetheora.c

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

Merge commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9'

* commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9':
  lavc: add error checking to apply_param_change.

Conflicts:
libavcodec/utils.c

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

Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93'

* commit '5c0a09839c707f10e5dba59460e219e989c1da93':
  libopenjpegdec: return meaningful error codes

Conflicts:
libavcodec/libopenjpegdec.c

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

lavf: Remove a now useless parameter to ffurl_register_protocol

This was added in 9b07a2dc02e9 as an ABI hack to allow older
code built with lavf 52 to register protocols even if the size
of the URLProtocol struct was increased. Later, registering
protocols from outside of lavf was removed and this workaround
isn't needed any longer since lavf 53.

This removes an unchecked malloc and a memory leak for the cases
when this workaround actually was used - which it hasn't since
lavf 53.

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

oggparsetheora: check av_mallocz result

oggparsetheora: return meaningful error codes

oggparsetheora: K&R cosmetics, reformat

Also typedef the private data struct and make its name consistent with
the rest of Libav.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

lavc: add error checking to apply_param_change.

libopenjpegdec: return meaningful error codes

avcodec/mpeg12dec: forward errors when EXPLODE is set

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

lavf/spdifdec: fix demuxing of AAC in IEC 61937

Return value of avpriv_aac_parse_header() is not checked correctly. Fix
it.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: remove pointless condition

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

Merge commit '58d13cea307e776664dae711608b358dd4b84fff'

* commit '58d13cea307e776664dae711608b358dd4b84fff':
  h264: Check all allocations

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

tests/fate: fix fate on branches different from origin/master

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

tests/fate.sh: run git reset only when fetch succeded

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

Merge commit '9510d7689e236f6a4748795604fba427c130d0ad'

* commit '9510d7689e236f6a4748795604fba427c130d0ad':
  fate.sh: Allow non-fast-forwards when updating sources

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

Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'

* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29':
  avconv: stop accessing AVStream.parser

Conflicts:
ffmpeg.h

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

avutil/opt: fix flags check on non x86

This should fix several fate failures

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

Merge commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04'

* commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04':
  lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv

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

lavf: remove unreliable timestamp guessing heuristic

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

Merge commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448'

* commit '25c7db7cc99d74fe6fb56a6fd52c9b5f1591e448':
  avio: Check for memory allocation failure of private data

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

Merge commit '327c439f811a89d774db9a86f72951d295193e5f'

* commit '327c439f811a89d774db9a86f72951d295193e5f':
  timefilter: Handle memory allocation failure

Conflicts:
libavdevice/jack_audio.c
libavdevice/timefilter.c

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

Merge commit 'e78913052263af80855590659fb0f705e8f13c8a'

* commit 'e78913052263af80855590659fb0f705e8f13c8a':
  configure: Provide an hardened toolchain option

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

Merge commit 'dcd3eda6cb8884beeb67ef5eb61b4bb6b01d29ea'

* commit 'dcd3eda6cb8884beeb67ef5eb61b4bb6b01d29ea':
  configure: Move gcc-only -W option where it belongs

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

avformat/avisynth: re-add trailing \n.

Regression since ac9529ce.

Spotted by Timothy Gu.

lavc/mpegvideo_enc: fix typo

lavc: extend documentation for the "bf" option

doc/muxers: add definitory line for the MOV/MP4/ISMV muxer

Also rename section name, to match the other ones adopting the muxer name
(rather than the related upcased standard name).

avcodec/mpegvideo_enc: check that max_b_frames is not negative

Fixes crash found by saste
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

matroskaenc: fixed display width / height calculation for stereo mode

Based-on: patch by Asan Usipov <asan.usipov@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

build: remove pointless condition

$(STRIP) always expands to something, because it is one of the commands
in the BRIEF list. This renders the condition pointless.

Signed-off-by: Ingo Brückl <ib@wupperonline.de>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

h264: Check all allocations

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

fate.sh: Allow non-fast-forwards when updating sources

avconv: stop accessing AVStream.parser

It is private and must not be touched from outside of lavf.

lavc: add a dummy field to AVStream to preserve ABI compatibility for avconv

avconv abuses the API by accessing AVStream.parser (which is private).
Removing AVStream.reference_dts in
2ba68dd044ca8fc591139c05563840f546a9c0c0 breaks ABI compatibility for an
old avconv using a newer lavf. Fix this by adding a dummy field until
the next bump.

h264: Check all allocations

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avio: Check for memory allocation failure of private data

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

timefilter: Handle memory allocation failure

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

timefilter: Fix typo in allocation failure message

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavfi: do not export the filters from shared objects

Conflicts:
libavfilter/af_amix.c
libavfilter/af_anull.c
libavfilter/asrc_anullsrc.c
libavfilter/f_select.c
libavfilter/f_settb.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
libavfilter/vf_colorbalance.c
libavfilter/vf_copy.c
libavfilter/vf_crop.c
libavfilter/vf_cropdetect.c
libavfilter/vf_drawbox.c
libavfilter/vf_format.c
libavfilter/vf_framestep.c
libavfilter/vf_frei0r.c
libavfilter/vf_hflip.c
libavfilter/vf_libopencv.c
libavfilter/vf_lut.c
libavfilter/vf_null.c
libavfilter/vf_overlay.c
libavfilter/vf_scale.c
libavfilter/vf_transpose.c
libavfilter/vf_unsharp.c
libavfilter/vf_vflip.c

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

configure: Provide an hardened toolchain option

configure: Move gcc-only -W option where it belongs

Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'

* commit 'feeafb4adabd5c17de1738ed9962e40892b20edb':
  lavf: do not export av_register_{rtp,rdt}_dynamic_payload_handlers from shared objects

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

avcodec/audioconvert: deprecate API

Note, the header was not installed so useage of this should be limited
but its not 0, there are some random pieces of code using it according
to google.

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

avcodec/cook: use av_freep()

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