Merge commit 'a53540840d26beb57a5e53b7f488c23ddf86e193'

* commit 'a53540840d26beb57a5e53b7f488c23ddf86e193':
  APIchanges: Mention lavfi and lavd identification symbol addition

Conflicts:
doc/APIchanges

No change as these symbols have been added a very long time ago to FFmpeg
and are already listed in APIchanges

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

Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'

* commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1':
  Revert "mov: Double-check that alias path is not an absolute path"

Conflicts:
libavformat/mov.c

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

Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'

* commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37':
  h264: Add support for Closed Caption export

Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c

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

avfilter: bump minor and add Changelog entry

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

avfilter/af_compand: fix clipping with default options

Decays and attacks where by default set only for first channel
which caused poor defaults to be used which produced clipping
on any higher channel.

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

avfilter: add Dynamic Audio Normalizer filter

avfilter/af_astats: measure minimal and mean difference between two consecutive samples

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

OS/2: Cleanup slib_create_def_cmd

Export symbols by name rather then ordinal.
Remove PROTMODE directive as it does not make sense for 32 bit library.
Also silences a warning from some linkers.

Signed-off-by: Dave Yeo <dave.r.yeo@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

libx264: Add support for the MPEG2 encoder

hq_hqa: Fix decoding when INFO section is absent

APIchanges: Mention lavfi and lavd identification symbol addition

Revert "mov: Double-check that alias path is not an absolute path"

This reverts commit 9286de045968ad456d4e752651eec22de5e89060.
The change broke support for legit absolute file paths.

Reported-by: Maksym Veremeyenko <verem@m1stereo.tv>.

h264: Add support for Closed Caption export

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavfi/af_pan: Support a maximum of 64 channels.
  lswr: Allow 64 channels internally.
  lavc: Allow 64 channels internally.

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

lavfi/af_pan: Support a maximum of 64 channels.

The Soundflower input device supports 64 channels.

lswr: Allow 64 channels internally.

lavc: Allow 64 channels internally.

avformat: bump micro version after adding concatdec features

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>

concatdec: add support for injecting packet metadata

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>

concatdec: add support for specifying outpoint of files

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>

concatdec: store eof condition in context

This is needed later for outpoint support which may leave the last file in a
not-eof state.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>

concatdec: add support for specifying inpoint of files

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>

mxfdec: calculate the index in display order

This should fix seeking for open GOP files as well.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Marton Balint <cus@passwd.hu>

Refactoring to move common QSV-related code part into libavcodec/qsvdec.c

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

avcodec/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.

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

avfilter/vf_eq: Support contrast from -1000 to 1000

Fixes "-vf eq=0.05,eq=20"

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

avfilter/af_astats: make sure p->last is actually always set when measuring max difference

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

avfilter/af_astats: also measure maximal difference between two consecutive samples

While here also mention bit depth in documentation.

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

avcodec/hap: move some per-stream setup into decoder init rather than per-frame

This change will reject frames with a texture type which doesn't match the stream description.

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

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

This patch adds MSA (MIPS-SIMD-Arch) optimizations for VP9 MC functions in new file vp9_mc_msa.c

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>

swscale/ppc/yuv2rgb_altivec: POWER LE support in the macros vec_unh() and vec_unl()

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

avcodec: loongson optimized idctdsp with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: loongson add constant definition

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/pthread_frame: clear priv_data, avoid stale pointer in error case

Fixes: b4b47bc2b3fb7ca710bfffe5aa969e37_signal_sigabrt_7ffff70eccc9_744_nc_sample2.avi with memlimit of 4194304
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

lavc: Add properties field to AVCodecContext.

The new field can hold information about losslessness and closed captions for now.

checkasm: Add unit tests for h264qpel

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

mpegts: Mark the muxer as supporting variable fps

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

hevc: Split the struct setup from the pps parsing

avfilter/vf_smartblur: use the name 's' for the pointer to the private context

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

avfilter/af_astats: calculate audio bit-depth

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

avfilter: add erosion, dilation, deflate & inflate filter

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

tests/checkasm/checkasm: Give macro a body to avoid potential unexpected syntax issues

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

avformat/utils: Fix regression with H264 stream probing

Fixes Ticket4725

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

avformat/utils: Print stream number in max_analyze_duration exit path

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

lavf/rtpenc_jpeg: Fix sending multiple quantization tables.

apng: Fix wrong default final frame delay in muxer

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

Merge commit '2cb34f82b92c15b811f5c03dc7f61a4baf6e02e3'

* commit '2cb34f82b92c15b811f5c03dc7f61a4baf6e02e3':
  checkasm: Add unit tests for h264qpel

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

Merge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e'

* commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e':
  mpegts: Mark the muxer as supporting variable fps

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

Merge commit 'c88c5eef53ff1619724ba47b722da64ec0593dab'

* commit 'c88c5eef53ff1619724ba47b722da64ec0593dab':
  hevc: Split the struct setup from the pps parsing

Conflicts:
libavcodec/hevc_ps.c

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

avcodec/mpeg4videodec: Clarify the mpeg4_unpack_bframes reference.

This should avoid misunderstandings like in Ticket4618

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

swscale/utils: Clear pix buffers

Fixes use of uninitialized memory
Fixes: a96874b9466b6edc660a519c7ad47977_signal_sigsegv_7ffff713351a_744_nc_sample.avi with memlimit 2147483648
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/mips/mpegvideo_mmi: Use av_assert2()

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

avcodec: loongson optimized mpegvideo dct unquantize with mmi

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec: loongson optimized h264pred with mmi

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

configure: loongson disable expensive optimizations in gcc O3 optimization

With gcc-4.9.2 loongson faild in test fate-dca, this is caused by option
-fexpensive-optimizations in -O3 optimization. We disable it temporarily
before the bug been fixed up.

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/internal: add more words to sentance

Hopefully fixes english syntax

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

MAINTAINERS: add myself as libkvazaar maintainer

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/mov: Implement a same origin policy for references instead of only allowing a subset of relative pathes in references

Fixes Ticket4671

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

avfilter/x86/vf_psnr.asm: split one line of license text into two

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

avfilter/vf_removegrain: add x86 and x86_64 SSE2 functions

Speed of all modes increased by a factor between 7.4 and 19.8 largely depending
on whether bytes are unpacked into words.  Modes 2, 3, and 4 have been sped-up
by a factor of 43 (thanks quick sort!)

All modes are available on x86_64 but only modes 1, 10, 11, 12, 13, 14, 19, 20,
21, and 22 are available on x86 due to the number of SIMD registers used.

With a contribution from James Almer <jamrial@gmail.com>

avcodec/mjpegdec: Fix DC overflow in decode_block()

Fixes Ticket4683

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

avformat/utils: inform the user if the protocol cannot be determined

Assuming the wrong protocol can lead to suboptimal seeking performance

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

avformat/utils: adjust short skip threshold in ff_configure_buffers_for_index() to avoid seeking if a packet is skiped

Fixes Ticket4126

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

avformat/mov: Fix opening relative references

Possibly fixes Ticket4671

the removed check is wrong and insufficient

Based on patch by Maksym Veremeyenko <verem@m1.tv>

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

avcodec/mpeg12dec: Fix decoding of faulty interlaced mpeg2

Fixes Ticket4721

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

avfilter/internal: Improve docs about ff_request_frame()

Reviewed-by: James Darnley <james.darnley@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/nvenc: Fix build with older gcc versions

Aparently anonymous structs weren't always supported, not even sure if
they are standard conformant.

avformat: don't crash API users when demuxing mp4

This code is one big chunk of WTF.

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

avcodec: add libkvazaar HECV encoder

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

vf_psnr: sse2 optimizations for sum-squared-error.

The internal line accumulator for 16bit can overflow, so I changed that
from int to uint64_t in the C code. The matching assembly looks a little
weird but output looks correct.

(avx2 should be trivial to add later.)

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

avutil/fifo: Fix the case where func() returns less bytes than requested in av_fifo_generic_write()

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

ffmpeg: Fix cleanup after failed allocation of output_files

Fixes: 39a25908b84604acdaa490138282d091_signal_sigsegv_7ffff713351a_331_WAWV.avi with memlimit of 262144
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avformat/mov: Fix deallocation when MOVStreamContext failed to allocate

Fixes: 260813283176b57b3c9974fe284eebc3_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 262144
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avfilter/vf_ssim: Fix "incompatible pointer type" warnings

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

ffmpeg: Fix crash with ost->last_frame allocation failure

Fixes: 1013dbde2c360d939cc2dfc33e4f275c_signal_sigsegv_a0500f_45_320vp3.nsv with memlimit of 536870912
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ffmpeg: Fix deallocating input threads with partly failed file allocation

Fixes: 18615ff56beedc63a884a8db0678b47c_signal_sigsegv_7ffff713351a_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 524288
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

vf_ssim: x86 simd for ssim_4x4xN and ssim_endN.

Both are 2-2.5x faster than their C counterpart.

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

avutil/mem_internal: add missing header includes

Fixes make checkheaders

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

libavcodec/qsv.c: Issue fixed: QSV engine does not release display handler under linux platform.

Reviewed-by: Gwenole Beauchesne <gb.devel@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Merge commit 'a5a6a786bfebb85c269abc25559fd71963983581'

* commit 'a5a6a786bfebb85c269abc25559fd71963983581':
  mp3: Forward seeking errors

Conflicts:
libavformat/mp3dec.c

No change as the avio_seek() that are part of seeking in mp3 are already
checked in FFmpeg

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

Merge commit '32c8d89c036b0e75ece74aea638df587099def0b'

* commit '32c8d89c036b0e75ece74aea638df587099def0b':
  hevc: Print the non-supported chroma_format_idc

Conflicts:
libavcodec/hevc_ps.c

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

Merge commit '8e373fe048812a25b238ea60a7052b8c07639a42'

* commit '8e373fe048812a25b238ea60a7052b8c07639a42':
  hevc: Factor out the pixel format mapping from the sps parser

Conflicts:
libavcodec/hevc_ps.c

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

Merge commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d'

* commit 'c571424c7f6276a6374e1784ce2a33d4b6a4292d':
  asfdec: prevent memory leaks found with Coverity Scan

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

avcodec/mpegvideo: Fix null pointer dereference of picture array

Fixes: 0d0a2bace067d09c08f0fa5340496c23_signal_sigsegv_7ffff713351a_342_WobblyWindowsIntro.avi with memlimit of 67108864
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

ffmpeg: Fix cleanup with ost = NULL

Fixes: 09e670595acbdafb226974b08dab66e3_signal_sigabrt_7ffff70eccc9_991_xtrem_e2_m64q15_a32sxx.3gp with memlimit of 1048576
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/hevc_parser: Fix memleaks in parser mix

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

avformat/oggdec: Check buf before copying data in to it

Fixes null pointer dereference
Fixes: aace024653cc62947336b86f8de812ab_signal_sigsegv_a0500f_343_WobblyWindowsIntro.ogg with memlimit 262144
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/pthread_frame: check avctx on deallocation

Fixes null pointer dereferences
Fixes: af1a5a33e67e479f439239097bd0d4fd_signal_sigsegv_7ffff713351a_152_Dolby_Rain_Logo.pmp with memlimit of 8388608
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

mp3: Forward seeking errors

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

hevc: Print the non-supported chroma_format_idc

And drop the spurious newline.

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

hevc: Factor out the pixel format mapping from the sps parser

The function will grow larger as more formats are supported.

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

asfdec: prevent memory leaks found with Coverity Scan

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

avcodec/hevc_parser: use the old parser only when hevc decoder is available

If it's not, then the new dependence-free parser will be used instead

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

avutil/frame: fix crash with av_frame_unref(NULL)

Fixes: af94b3a3d26586c08f557cafe8246251_signal_sigsegv_7ffff713351a_343_XFMode.ASF with 2097152 alloc limit
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/mpegvideo: Check for NULL in ff_mpv_common_end()

Fixes: af94b3a3d26586c08f557cafe8246251_signal_sigsegv_7ffff713351a_343_XFMode.ASF with 1048576 alloc limit
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

avcodec/vp3: check current_frame before accessing it

Fixes null pointer dereference
Fixes: b15eb06e0111e94bc59123c86db7aff9_signal_sigsegv_a0500f_45_320vp3.nsv with allocation limit 536870912
Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

configure: Fix build with --disable-decoders --enable-parser=hevc

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

Merge commit '1b9a8e5f1d007ea19f04032490d681becd0d4e6a'

* commit '1b9a8e5f1d007ea19f04032490d681becd0d4e6a':
  dxva2_hevc: unbreak compilation after recent sps/pps changes

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

Merge commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b'

* commit 'a062a55d37720abc8c704aa0e8682efd3cdc9c9b':
  hevc_parser: fix standalone build with the hevc decoder disabled

Conflicts:
libavcodec/Makefile
libavcodec/hevc.c

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

Merge commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc'

* commit 'b9f76d19d81fbc7f088536f966c2d3dc23c34ddc':
  hevc_ps: make sure failing to decode an SPS always returns an error

Conflicts:
libavcodec/hevc_ps.c

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