Merge commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751'

* commit 'ae05b4865514fd71b5e9431e93aa0d03d7ba7751':
  hevc: eliminate the second call to hls_nal_unit()

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'd7bebe4805193783f0b6f292f9127a75709fb7d9'

* commit 'd7bebe4805193783f0b6f292f9127a75709fb7d9':
  hevc: skip invalid/ignored NALUs when splitting the packet

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'b11acd57326db6c2cc1475dd0bea2a06fbc85aa2'

* commit 'b11acd57326db6c2cc1475dd0bea2a06fbc85aa2':
  hevc: remove HEVCContext usage from hevc_ps

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_cabac.c
libavcodec/hevc_filter.c
libavcodec/hevc_mvs.c
libavcodec/hevc_ps.c
libavcodec/hevc_refs.c
libavcodec/hevcpred_template.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/vf_w3fdif: implement slice threading

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

avfilter/vf_stereo3d: implement slice threading for anaglyph output

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

fate: add tests for stereo3d anaglyph modes

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

Merge commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7'

* commit 'ab05ed4c322ed0488ac9b5d2ef5d4ffa55a946a7':
  mpegvideo_parser: export pixel format and dimensions

Conflicts:
libavcodec/mpegvideo_parser.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '9f4c7397a296e6d11b3c6c121a6896163577dc7c'

* commit '9f4c7397a296e6d11b3c6c121a6896163577dc7c':
  hevc: check slice address length

See: 05cc8c8e4b7008ff3be8ec477c901b2ceca4b16b
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043'

* commit 'a9a2f3613040c4f90bf15cbd76f8671252ecc043':
  doc: add a section about building with libmfx

Conflicts:
doc/general.texi

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '86eee85daddb682fa072c2e2657c90a514b855e3'

* commit '86eee85daddb682fa072c2e2657c90a514b855e3':
  bytestream2: set the reader to the end when reading more than available

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717'

* commit '8bc67ec2c0d2b5444d51a1bed1d50f0e10d92717':
  Checkasm: assembly testing and benchmarking tool

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/isom: utilize bitrate hints

Fixes Ticket4546

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

movtextdec.c: Add support for highlight and hilightcolor box

Signed-off-by: Niklesh <niklesh.lalwani@iitb.ac.in>

avcodec/dcadec: silence request_channels deprecation warnings

This also prevents an eventual compilation failure once request_channels
is removed.

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

hevc: eliminate the second call to hls_nal_unit()

Also, make hls_nal_unit() work only on the provided NAL unit, without
requiring a whole decoding context.

This will allow splitting this code for reuse by the parser.

hevc: skip invalid/ignored NALUs when splitting the packet

There is no need to wait until actually decoding the NALU. This will
allow to get rid of the second hls_nal_unit() call later.

hevc: remove HEVCContext usage from hevc_ps

Factor out the parameter sets into a separate struct and use it instead.

This will allow us to reuse this code in the parser.

mpegvideo_parser: export pixel format and dimensions

hevc: check slice address length

It is used as get_bits argument and reading 0 bits doesn't make sense.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

doc: add a section about building with libmfx

bytestream2: set the reader to the end when reading more than available

This prevents possible infinite loops with the calling code along the
lines of while (bytestream2_get_bytes_left()) { ... }, where the reader
does not advance.

CC: libav-stable@libav.org

vf_ssim: fix s->coefs for yuv with non-4:2:0 subsampling.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Checkasm: assembly testing and benchmarking tool

It provides the following features:
 * verify correctness by comparing output to the C version.
 * detect failure to save and restore clobbered callee-saved registers.
 * detect 32-bit parameters being used as if they were 64-bit in x86-64
   (the upper halves are not guaranteed to be zero - but in practice
   they very often are, which makes those bugs hard to spot otherwise).
 * easy benchmarking.

Compile by running 'make checkasm'.
Execute by running 'tests/checkasm/checkasm'.

Optional arguments are '--bench' to run benchmarks for all functions,
'--bench=<pattern>' to run benchmarks for all functions that starts with
<pattern>, and '<integer>' to seed the PRNG for reproducible results.

Contains unit tests for most h264pred functions to get started, more tests
can be added afterwards using those as a reference.

Loosely based on code from x264. Currently only supports x86 and x86-64,
but additional architectures shouldn't be too much of an obstacle to add.

Note that functions with floating point parameters or floating point
return values are not supported. Some compiler-specific features or
preprocessor hacks would likely be required to add support for that.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>

Merge commit '796268654c7807c9a1cfb322c838383e2b900d60'

* commit '796268654c7807c9a1cfb322c838383e2b900d60':
  asfdec: always reset packet state after seeking

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/riffde: Fix integer overflow in bitrate

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'f1bdc234370401c032cd85184e93c7c155eb6d62'

* commit 'f1bdc234370401c032cd85184e93c7c155eb6d62':
  riff: Validate bitrate

Conflicts:
libavformat/riffdec.c

See: 189420cb561929e05f5cc4224cdca83740a24a32
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

riffdec: prevent negative bit rate

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d'

* commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d':
  mp3: Make the seek more robust

Conflicts:
libavformat/mp3dec.c

Mostly not merged

See: b6267901c466c482b2f1af3578b0a6d88265d144 and various later commits

The bug is also not reproducable in FFmpeg

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'd80811c94e068085aab797f9ba35790529126f85'

* commit 'd80811c94e068085aab797f9ba35790529126f85':
  riff: Use the correct logging context

Conflicts:
libavformat/asfdec_o.c
libavformat/avidec.c
libavformat/dxa.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/riff.h
libavformat/riffdec.c
libavformat/wavdec.c
libavformat/wtvdec.c
libavformat/xwma.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '355864ef7a9548ee6491a25de1e0650bd983a667'

* commit '355864ef7a9548ee6491a25de1e0650bd983a667':
  g726: Do not crash on user mistake

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

ivfenc: write duration at end-of-stream.

At the beginning, the value is not initialized.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

asfdec: always reset packet state after seeking

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

avformat/brstm: Remove unused variable

Fixes "libavformat/brstm.c:128:35: warning: variable info_size set but not used"

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/yuv4mpegdec: Use 64bit for file offset

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/utils: Assert that the pointer is set when size is in ff_fast_malloc()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/utils: Avoid undefined void casts in ff_fast_malloc()

based on code from libavutil/mem.c

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avutil/mem: Fix potential overflow in overallocation code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/utils: Fix potential overflow in overallocation code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

fate: add tests for w3fdif filter

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

avformat/yuv4mpegdec: remove unused variable

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

vf_psnr: fix rgb channel order mixup in final log message.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

vf_psnr: always calculate MSE over full pixel range.

This makes the output compatible with that of pretty much any other
tool that calculates PSNR.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

riff: Validate bitrate

mp3: Make the seek more robust

Try to parse up to 4 packets to find the closest packet.

Reported-By: jan.schlueter@ofai.at

riff: Use the correct logging context

g726: Do not crash on user mistake

Properly report the sample rate as invalid

CC: libav-stable@libav.org

avformat/yuv4mpegdec: Remove unused variables

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

yuv4mpeg: add rough duration estimate and seeking.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

vF_psnr: move set_meta() calls out of loop.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3'

* commit '87f98a2b9d4c7218ad82bb45347a53b65e5244f3':
  fbdev: Support the RGB565 colour space.

Conflicts:
libavdevice/fbdev_dec.c

See: 43d36599fe3330913c6be9da5519dee048263dc9
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

fbdev: Support the RGB565 colour space.

Tested on a Raspberry Pi.

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

vf_psnr: add channel weighting based on chroma subsampling.

Also add per-channel psnr stream averages to final log message.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '1410eeb6ea6bc5784e40032430afcdf54a79aedb'

* commit '1410eeb6ea6bc5784e40032430afcdf54a79aedb':
  imc: Use correct position for flcoeffs2 calculation

See: 75fd5ce4c1c0b2d96d71c74b650cefaaef519d27
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/mpeg4videodec: Check P cbpy

Fixes undefined behavior
Fixes: signal_sigsegv_c3097a_991_xtrem_e2_m64q15_a32sxx.3gp
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

imc: use correct position for flcoeffs2 calculation

flcoeffs2[pos] should be the log2 of flcoeffs1[pos].
flcoeffs1[0] can be 0 here, thus flcoeffs2[pos] gets set to -inf,
causing problems further down.

This seems to have been copied from imc_decode_level_coefficients in
commit 4eb4bb3 without updating the position.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

avfilter/vf_ssim: Mark constant tables as const

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/j2kenc: remove unused variable

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

imc: Use correct position for flcoeffs2 calculation

flcoeffs2[pos] should be the log2 of flcoeffs1[pos].
flcoeffs1[0] can be 0 here, thus flcoeffs2[pos] gets set to -inf,
causing problems further down.

This seems to have been copied from imc_decode_level_coefficients in
commit 4eb4bb3 without updating the position.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

hevc: check slice address length

It is used as get_bits argument and reading 0 bits isn't supported.

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

Merge commit '872fab4a3df48e7e6484333ee2228c684e319634'

* commit '872fab4a3df48e7e6484333ee2228c684e319634':
  asfdec: Fix reading from the pipe

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/utils: Document 32 min for h264 width

Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/g2meet: Check R/G/B values in epic_decode_pixel_pred()

Fixes: asan_double-free_d34593_861_smp3.wmv
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

snow: remove an obsolete av_assert2

It asserts that the frame linesize is larger than 37, but it can be
smaller and decoding such frames works.

Before commit cc884a35 src_stride > 7*MB_SIZE was necessary, because the
blocks were interleaved in the tmp buffer and the last block was added
with an offset of 6*MB_SIZE.
It was changed for src_stride <= 7*MB_SIZE to write the blocks
sequentially, hence the larger tmp_step.
After that the assert was only necessary to make sure that the buffer
remained large enough.
Since commit bd2b6b33 s->scratchbuf is used as tmp buffer.
As part of commit 86e107a7 the minimal scratchbuf size was increased to
256*7*MB_SIZE, which is enough for any src_stride <= 7*MB_SIZE.

Also add a comment explaining the tmp_step calculation.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>

avcodec/utils: use a minimum 32pixel width in  avcodec_align_dimensions2() for H.264

Fixes Assertion failure
Found-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/motion_est_template: Fix undefined behavior in small_diamond_search()

Fixes: asan_heap-oob_394322e_138_cov_4265020547_CVPCMNL1_SVA_C.264
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

asfdec: Fix reading from the pipe

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

avfilter/vf_removegrain: clip to uint16 instead to uint8

This is how original filter behaves.

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

avcodec/libopenh264enc: Do not truncate frame rate

Suggested-by: Gregory J Wolfe <gregory.wolfe@kodakalaris.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '67c884eb07c7e9f2cb72bb8d447d945e5ac8cac7'

* commit '67c884eb07c7e9f2cb72bb8d447d945e5ac8cac7':
  libvpx: Add the library header

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

Merge commit '461b45efd04859b2672238bc8a6ecab9e9a14948'

* commit '461b45efd04859b2672238bc8a6ecab9e9a14948':
  lavc: Add nvenc.h to the skipheader

Conflicts:
libavcodec/Makefile

No change as there is no nvenc.h in FFmpeg

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

libavcodec/qsvenc.c: improving handling for return codes of MFXVideoENCODE_EncodeFrameAsync

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

avcodec/mpegvideo: Clear pointers in ff_mpv_common_init()

This ensures that no stale pointers leak through on any path

Fixes: signal_sigsegv_c3097a_991_xtrem_e2_m64q15_a32sxx.3gp
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libvpx: Add the library header

Unbreak make checkheaders

lavc: Add nvenc.h to the skipheader

Unbreak make checkheaders

fate: add removegrain tests

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

lavf/rtpenc_jpeg: Error out for non-standard Huffman tables.

Related to ticket #3823.

lavf/rtpenc_jpeg: Do not check the table number when checking precision.

ffmpeg: Use av_log to print benchmark output.

Cosmetics: Reindent after last commit.

lavf/matroskaenc: Do not needlessly allocate memory for cuepoints.

Fixes ticket #4690.

libavcodec/qsvenc.c: Fix for too agressive height alignment during frame encoding which may be reason of superflous frame copying.

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

avcodec/qsvenc_hevc: Attempt to fix error: too few arguments to function ff_hevc_extract_rbsp

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

libavcodec: Implementation of AAC_fixed_decoder (LC-module) [4/4]

Build system modified

There are several warnings occurring during build after this patch is
applied. The cause of most of these warnings is in that some definitions
needed here are logical part of sbr module and are added in later patches.
When this patches are applied these warnings stop occurring.

The only warning that is added here and is not fixed with later patches
is warning that warns that type mismatch for table ff_aac_eld_window_480.

The reason for this warning is in that ER AAC ELD 480 is not integrated in
to the fixed point implementation at this moment and there is no fixed point
version of this table.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec: Implementation of AAC_fixed_decoder (LC-module) [3/4]

Add fixed point implementation

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec: Implementation of AAC_fixed_decoder (LC-module) [2/4]

Add fixed point implementation of functions for generating tables

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec: Implementation of AAC_fixed_decoder (LC-module) [1/4]

Move existing code to the new template files

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/hevc_ps: Remove gotos from ff_hevc_parse_sps()

They are currently unnecessary

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

Merge commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784'

* commit '84b223cc6d6ed4cc8bd295457a90f7c94a9dd784':
  configure: Make the new qsv encoder depend on libmfx

Conflicts:
configure

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

Merge commit 'd1a6cb195f610978ba5d2351e60f938f7f261d59'

* commit 'd1a6cb195f610978ba5d2351e60f938f7f261d59':
  x86: Serialize rdtsc in read_time()

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

Merge commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9'

* commit '40af330adf7fde8073271cf2b41ff9adc4c2bba9':
  avconv: vda: Unlock the pixel buffer once it is accessed

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

Merge commit '8fcd121b823caeadbe7597c9ae9229f6f164f949'

* commit '8fcd121b823caeadbe7597c9ae9229f6f164f949':
  doc: Use the succinct syntax for the channelmap example

Conflicts:
doc/filters.texi

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

configure: Fix build without libmfx

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

Merge commit '66acb76bb0492b263215ca9b4d927a7be39ace02'

* commit '66acb76bb0492b263215ca9b4d927a7be39ace02':
  lavc: add Intel libmfx-based HEVC encoder

Conflicts:
Changelog
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/qsv.c
libavcodec/qsvenc.c
libavcodec/version.h

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

configure: Fix build without libmfx

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

Merge commit '3a85397e8bb477eb34678d9edc52893f57003226'

* commit '3a85397e8bb477eb34678d9edc52893f57003226':
  lavc: add Intel libmfx-based MPEG2 encoder

Conflicts:
Changelog
configure
libavcodec/allcodecs.c

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

Merge commit '69ab9f53f901eac6a649e22d28cf093357870627'

* commit '69ab9f53f901eac6a649e22d28cf093357870627':
  hevc: split bitstream unescaping to a separate file

Conflicts:
libavcodec/Makefile
libavcodec/hevc.c

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

avcodec/hevc_ps: Do not return success on failures in ff_hevc_parse_sps()

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

Merge commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7'

* commit 'fd124d8357b1becfde3ac8d5e3320127cf97a5b7':
  hevc_ps: split the code for parsing the SPS and exporting it into the context

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_ps.c

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

avcodev/libdcadec: implement request_channel_layout

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

Merge commit '0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e'

* commit '0e7c0ec344f542e68e3cc9680e8d41dffeffdb4e':
  lavf/hevc: pad the RBSP buffer as required by the bistream reader

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