Merge commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741'

* commit 'f89f78c1c563d98f10ee1d7e1ed67c9f9e03b741':
  lavc: add a HEVC mp4->annex B bitstream filter

Conflicts:
Changelog

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

Merge commit '96dca089b19bf55293136277f5b081c56146e10e'

* commit '96dca089b19bf55293136277f5b081c56146e10e':
  qsvdec: move qsv_process_data() from qsvdec_h264 to the common code

Conflicts:
libavcodec/qsvdec.c
libavcodec/qsvdec_h264.c

No change as the parser code has been removed

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

avfilter/Makefile: fix order of framestep filter

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

avfilter: add sidechain compress audio filter

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

Merge commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9'

* commit 'fa85fcf2b7d1ab822a59245077b8bb855406d3e9':
  qsvenc_hevc: fix enum declaration

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

avcodec/nvenc: Remove unused parameter

Merge commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d'

* commit '22522d9c2c69624fe4d81d61ee65a56610f22f1d':
  qsvdec: fix a memleak of async_fifo

Conflicts:
libavcodec/qsvdec.c

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

Merge commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d'

* commit 'aa9d15d89bb4ee8a31607d3db1b8c5334eb88d2d':
  qsvdec: avoid an infinite loop with no consumed data and no output

Conflicts:
libavcodec/qsvdec.c

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

avcodec/aacps_fixed_tablegen: change f_center to 64bit to avoid overflow

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

avutil/softfloat: Add a test for av_sincos_sf()

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

avcodec: Add QSV VC-1 video decoder.

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

avformat/nutenc: Omit AV_PKT_DATA_QUALITY_STATS when storing side data.

This side data does not serve or improve decoding the data, it thus
would semantically be metadata and not side data.

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

avcodec: Add QSV MPEG-2 video decoder.

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

lavc: add a HEVC mp4->annex B bitstream filter

qsvdec: move qsv_process_data() from qsvdec_h264 to the common code

It will be shared with the upcoming mpeg2 and hevc decoders.

qsvenc_hevc: fix enum declaration

Declare a named enum, not a variable with anonymous enum type.

qsvdec: fix a memleak of async_fifo

init() is called whenever format changes, so current code would leak the
fifo in this case.

qsvdec: avoid an infinite loop with no consumed data and no output

This is triggerable with the HEVC decoder. It is unclear yet whether the
bug is in the calling code or the MSDK, but it seems better to check for
this in any case.

avcodec/dvdec: only attempt to conceal errors based on STA inconsistencies when error_concealment is set

This allows the user to disable it in the hypothetical case that STA values are wrong

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

avcodec/aacps: Fix ;;

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

avcodec/aactab: Add ff_aac_eld_window_480_fixed

Fixes pointer type mismatch

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

avcodec/aactab: Fix rounding of elements in ff_aac_eld_window_512_fixed

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

swscale/output: Fix "warning: assignment from incompatible pointer type"

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

avformat/async: wake up main thread before exit background thread

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

avformat/async: move more code into locked area in background thread

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

avcodec/dvdec: skip 3rd stage ac decoding when the headers indicates that the data is inconsistent

Fixes Ticket1589

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

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 intra functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

configure: fix LARGEADDRESSAWARE flag with MSVC

Otherwise it would get translated like a library path (-L option),
which breaks setting the flag.

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

avcodec/aacsbr: add missing header include

Fixes make checkheaders

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

Merge commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a'

* commit 'c9edbe4af901e9bc9f05a62319637f9760df9a4a':
  use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

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

use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

favor link over link.exe in case some wrapper script already exists
fallback to "link" in the path if the one next to cl is not found

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

avcodec/dvdec: Retry decoding seemingly damaged MBs while skiping likely damaged parts

Improves decoding of Ticket1589

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

use a wrapper script to call MS link.exe to avoid mixing with /usr/bin/link.exe

Fallback to "link" in the path if the one next to cl is not found.

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

swscale: ayuv64le output support

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

swscale: ayuv64le input support

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

avutil: add ayuv64le and ayuv64be packed pixel format

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

avfilter: rename vf_reverse.c to f_reverse.c

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

avfilter: add areverse filter

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

libavcodec/qsvdec_h264.c: packet buffering has been removed since qsvdec.c does maintain own data buffering now.

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

libavcodec/qsvdec.c: The ff_qsv_decode() now guarantees the consumption of whole packet.

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

avcodec/hapdec: Check that there is sufficient input data

Fixes Ticket4729

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

Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9'

* commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9':
  configure: force -nologo- when detecting MSVC

Conflicts:
configure

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

Merge commit '44f7df0c987965763c609f6dc36974b04182e58d'

* commit '44f7df0c987965763c609f6dc36974b04182e58d':
  dds: Write the palette in the native endian form

Conflicts:
libavcodec/dds.c

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

configure: force -nologo- when detecting MSVC

The -nologo- option is the inverse of -nologo, reenabling printing the
"logo" version header. This is useful if the compiler actually is a
wrapper that forces -nologo.

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

avcodec/hap: (trivial) rename enum values and document their meaning

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

avcodec/hap: (trivial) clarify comment

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

dds: Write the palette in the native endian form

This fixes the palette on big endian, broken (or, differing from
little endian) since 57214b2f7.

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

hap: Name enums, remove unused struct member

snappy: Refactor so ff_snappy_uncompress() uses an existing buffer

Some uses of Snappy require uncompressing to positions within
an existing buffer. Also adds a function to get the uncompressed
length of Snappy data.

asfdec: remove the wrong condition

this condition breaks reading from the pipe as data_reached variable
have to be set to break while in the asf_read_header just after the Data
Object is found

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

hap: Fix slice size computation

A bug was introduced in 977105407cae55876041dddbf4ce0934cdd4cd6c whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.

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

dds: Fix the slice size computation

A bug was introduced in 6b2b26e7af3ede0abfb46eb5725c26d1083f50bc whereby when
frame height wasn't divisible by the number of threads, pixels would be omitted
from the bottom rows during decode.

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

af_channelmap: properly set the supported output channel layouts

The current code expects query_formats() to be called exactly once, it
will leak if it's not called at all (filter initialized, but never
configured or used) or try to read freed memory if it's called more than
once.

Found-by: James Almer <jamrial@gmail.com>
CC: libav-stable@libav.org

asfdec: increment nb_streams right after the stream allocation

to prevent possible memory leaks

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

asfdec: set nb_streams to 0 in the asf_read_close

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

doc/filters.texi: fix two typos in reverse filter description

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

avfilter/vf_reverse: check also pts_size when reallocating

Fixes crash of x32.

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

Merge commit '11f3d5c69b711a1f1631961921ecd20d31f8336d'

* commit '11f3d5c69b711a1f1631961921ecd20d31f8336d':
  hap: Name enums, remove unused struct member

Conflicts:
libavcodec/hap.h

See: 440c26e9c46bb26bc1fc8306561ed6962ae7d3bf
See: d8488090e5070187e9d8d0a93b8d841f26bde990
Merged-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit '083cbc930d077651ea7e3fbc32ec45352cfed7e7'

* commit '083cbc930d077651ea7e3fbc32ec45352cfed7e7':
  snappy: Refactor so ff_snappy_uncompress() uses an existing buffer

Conflicts:
libavcodec/hapdec.c
libavcodec/snappy.c

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

avcodec/mips/vp9_idct_msa: Replace __volatile__ by volatile

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

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 idct functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavcodec/qsvdec_h264.c: refactoring: functionality of qsv_process_data() has been moved into qsvdec.c

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

avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP9 lpf functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavc/hevc: rudimentary support for skip_loop_filter.

+~9% speed on Core i5 on test sample.

All frames are treated as ref frames, skipping only applies
at level "all". The following mail contains information on
how to improve that:
http://ffmpeg.org/pipermail/ffmpeg-devel/2015-July/176116.html

avcodec/hevc_parse: Print the name of the NAL units in addition to the numerical nal_unit_type in the debug output

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

Merge commit '7f388c0fabc51eca3106e7cc443393269435ab52'

* commit '7f388c0fabc51eca3106e7cc443393269435ab52':
  asfdec: remove the wrong condition

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

Merge commit 'ae5a8dca675ee544178225256893e679b750cb63'

* commit 'ae5a8dca675ee544178225256893e679b750cb63':
  hap: Fix slice size computation

Conflicts:
libavcodec/hapdec.c

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

Merge commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360'

* commit 'ebe8b5d947c41449c684f17c6826fe6bc46c0360':
  dds: Fix the slice size computation

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

Merge commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4'

* commit '22ecfcd4c79cdf812fdf406525ddf0fd1f7114e4':
  af_channelmap: properly set the supported output channel layouts

Conflicts:
libavfilter/af_channelmap.c

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

Merge commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6'

* commit 'aed7715b8fa295980c221f1cd095d42cd3bd74a6':
  asfdec: increment nb_streams right after the stream allocation

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

Merge commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff'

* commit 'ee80f834cbb6dbacdc1efb4c658a7d775e82ebff':
  asfdec: set nb_streams to 0 in the asf_read_close

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

avutil/softfloat: move av_sincos_sf() back to header

Fixes compilation of host tool aacps_fixed_tablegen

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

libavcodec/qsvdec_h264.c: SPS parsing is now performed by MFXVideoDECODE_DecodeHeader() in libavcodec/qsvdec.c

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

tests/checkasm/h264pred: Use LOCAL_ALIGNED_16()

Fixes alignment issue and bus errors

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

tests/checkasm/h264qpel: Use LOCAL_ALIGNED_16()

Fixes alignment issue and bus errors

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

Edit documentation and versioning for the fixed point AAC decoder

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

avcodec: Minor macro polishing

Use macros from aac_defines.h for adding suffixes
 instead of local macros.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

fate: Make ffprobe tests depend on avdevice

The test file they use needs avdevice to be created

Probably fixes Ticket 4455

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

tests: Add aac_fixed decoder test

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: Implementation of AAC_fixed_decoder (PS-module)

Add fixed point implementation.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: Table creation for AAC_fixed_decoder (PS-module)

Add fixed point implementation of functions for generating tables.

Signed-off-by: Nedeljko Babic <nedeljko.babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: remove unused sd variables

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

avformat/dump: Also print pict_type in dump_sidedata() for AV_PKT_DATA_QUALITY_STATS

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

avcodec/libx264: Export choosen pict_type

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

avcodec/dnxhdenc: Set pict type for AV_PKT_DATA_QUALITY_STATS correctly

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

avcodec/libxavs: Export pict_type in side data

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

Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATS

The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported
This also replaces the native by fixed little endian order for the affected side data

AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS

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

apng: Fix decoding images with the PREVIOUS dispose op

Merge commit '21c90d86d27c2143354c7d782050a779b0986eb1'

* commit '21c90d86d27c2143354c7d782050a779b0986eb1':
  mpegvideo: Add missing include

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

Merge commit 'a16854892c3af945d3ab0015699a0c9884f0a89a'

* commit 'a16854892c3af945d3ab0015699a0c9884f0a89a':
  dds: Add a rgba fate test

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

avfilter: add deband filter

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

Merge commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221'

* commit 'd08d8b61aa9f07d3ea993fe5392f7408c958d221':
  dds: Fix 32bpp bitmaps decoding

Conflicts:
libavcodec/dds.c

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

Merge commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c'

* commit '57214b2f7f9b1ccfd61e232e8989b5ee850f169c':
  dds: Fix palette decoding

Conflicts:
libavcodec/dds.c

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

Merge commit 'ea4d46e72945cba37feb7aa154eb970732f513e4'

* commit 'ea4d46e72945cba37feb7aa154eb970732f513e4':
  dds: Fix enum declaration

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

Merge commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec'

* commit '2a187a074a7f5ad9f01f72ac9715ddfcb2dbb8ec':
  asfdec: avoid crash in the case when chunk_len is 0 or pkt_len is 0

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

Merge commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd'

* commit '93f16f338f9e8aba0c006752eb3afc3fe6e137fd':
  asfdec: close the demuxer properly when read_header is failing

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

Merge commit '5655236a67203d923755f285584c6e68abe7e33f'

* commit '5655236a67203d923755f285584c6e68abe7e33f':
  asfdec: factor out seeking to the Data Object outside while

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

Merge commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c'

* commit 'ecee1148af4989e1f9e16f0cdc9f98ad2045538c':
  qsvenc_hevc: use the correct HW plugin UID

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

Merge commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb'

* commit 'e605bf3b590d295f215fcc9fd58eb11be55b68cb':
  checkasm: remove empty array initializer list in h264pred test

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

Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'

* commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5':
  checkasm: Always link statically

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