Merge commit 'cb33f8d0f48b1e9d642ca1cbea142dcbedd08a27'

* commit 'cb33f8d0f48b1e9d642ca1cbea142dcbedd08a27':
  checkasm: Give macro a body to avoid potential unexpected syntax issues

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

Merge commit '6cc4d3e9a982e926494f4b919d9733fe29774acf'

* commit '6cc4d3e9a982e926494f4b919d9733fe29774acf':
  checkasm: exit with status 0 instead of 1 if there are no tests to perform

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

Merge commit '256ef19844892c6cf8e0386e3287bae970ec6320'

* commit '256ef19844892c6cf8e0386e3287bae970ec6320':
  h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1

Conflicts:
libavcodec/arm/h264pred_init_arm.c

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

Merge commit 'fc56868399213d3e9be19bdebeb64df233b39a7e'

* commit 'fc56868399213d3e9be19bdebeb64df233b39a7e':
  cosmetics: Reformat checkasm tests

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

avformat/async: support filling with a background thread.

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

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

checkasm: exit with status 0 instead of 1 if there are no tests to perform

h264: arm: use intra pred8x8 functions only for chroma_format_idc <= 1

Merge commit 'd37f23263584774e1798e9ac909a398304a05091'

* commit 'd37f23263584774e1798e9ac909a398304a05091':
  checkasm: Add unit tests for bswapdsp

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

Merge commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42'

* commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42':
  x86: bswapdsp: Don't treat 32-bit integers as 64-bit

Conflicts:
libavcodec/x86/bswapdsp.asm

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

Merge commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09'

* commit 'f5ee23004d1177ca6dd99b92cb4ff4b94b2eae09':
  configure: Factor out g722dsp module

Conflicts:
configure
libavcodec/arm/Makefile

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

Merge commit 'a623aa0069dff586241ad2ffedcd45ed840e2553'

* commit 'a623aa0069dff586241ad2ffedcd45ed840e2553':
  configure: Factor out wmv2dsp module

Conflicts:
libavcodec/Makefile

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

Merge commit 'd42191c78befc1983f23b1899b2dda513b72f1ed'

* commit 'd42191c78befc1983f23b1899b2dda513b72f1ed':
  configure: Factor out vp8dsp module

Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile

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

Merge commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b'

* commit 'd4aea1aa4060fb5ba7f5f426823b697d2a5af08b':
  configure: Factor out vp56dsp module

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

Merge commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418'

* commit '5cb4bdb2a03c3643f8f1e7d21d7094e61e0a4418':
  configure: Factor out rv34dsp module

Conflicts:
libavcodec/Makefile
libavcodec/x86/Makefile

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

avcodec/libx264: fix MPEG2 support

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

Merge commit '575ec60e542114b2ef5b2f88b28eeb72389dda45'

* commit '575ec60e542114b2ef5b2f88b28eeb72389dda45':
  configure: Factor out mss34dsp module

Conflicts:
libavcodec/Makefile

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

Merge commit '2edc77dc7be5f4a006c6295f4c827e5471f85262'

* commit '2edc77dc7be5f4a006c6295f4c827e5471f85262':
  configure: Factor out ividsp module

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

Merge commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0'

* commit 'b075869bc1e1aadea0a8dc819ebfb758adb9e3d0':
  configure: Factor out flacdsp module

Conflicts:
configure
libavcodec/Makefile
libavcodec/arm/Makefile

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

Merge commit '4da585ae478f8b6f865ab13779af399aee20d899'

* commit '4da585ae478f8b6f865ab13779af399aee20d899':
  OS/2: Cleanup slib_create_def_cmd

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

cosmetics: Reformat checkasm tests

Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'

* commit 'e1319aa1c1be9b64117c19170344fb78841dd67c':
  libx264: Add support for the MPEG2 encoder

Conflicts:
configure
libavcodec/Makefile
libavcodec/libx264.c

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

avfilter/af_dynaudnorm: Fix "ISO C90 forbids mixed declarations and code" warnings

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

avfilter/af_aresample: Check ff_all_* for allocation failures

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

checkasm: Add unit tests for bswapdsp

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

x86: bswapdsp: Don't treat 32-bit integers as 64-bit

The upper halves are not guaranteed to be zero in x86-64.

Also use `test` instead of `and` when the result isn't used for anything other
than as a branch condition, this allows some register moves to be eliminated.

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

configure: Factor out g722dsp module

configure: Factor out wmv2dsp module

configure: Factor out vp8dsp module

configure: Factor out vp56dsp module

configure: Factor out rv34dsp module

configure: Factor out mss34dsp module

configure: Factor out ividsp module

configure: Factor out flacdsp module

Merge commit '0cf5588d69922aa3e063bac6304c09c543a9ef52'

* commit '0cf5588d69922aa3e063bac6304c09c543a9ef52':
  hq_hqa: Fix decoding when INFO section is absent

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

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>