Merge commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41'

* commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41':
  lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)

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

lavfi/dctdnoiz: fix 10l typo in pr_height computation.

ffmpeg: free threads on error conditions.

Fixes Ticket2562

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

lavfi: add dctdnoiz filter.

avcodec/avpacket: Refactoring copy_side_data into a separate function

Refactoring copy_side_data into a separate function so that it can be called
in cases where side data needs to be duplicated.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

libx264: zero x264_picture before use.

This prevents use of uninitialized memory by ffmpeg later
(i_qpplus1)

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

libavfilter/Makefile: unbreak make alltools

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

tools: add zmqsend tool, useful to test the zmq filters

lavfi: add zmq filters

lavu/hash: Fix name of SHA224

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

lavfi/blend: timeline support

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

swscale/output: silence compiler warnings about uninitialized variables

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

doc/outdevs: fix typos (devices -> device)

lavfi: cosmetics: fix vertical alignment for pads in some filters

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

avformat/srtdec: Fix pointer corruption

This fixes use of uninitialized memory and possible out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vf_colorchannelmixer: round lut entries to nearest

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

fate: change colorchannelmixers coefficients to be less unstable

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Disable PIC for cygwin just as for win32/mingw

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

Merge commit '1399931d07f0f37ef4526eb8d39d33c64e09618a'

* commit '1399931d07f0f37ef4526eb8d39d33c64e09618a':
  x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

Conflicts:
libavcodec/x86/dsputil_mmx.c

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

Merge commit '245b76a108585b6fb52eebc2626c472d6fa530dc'

* commit '245b76a108585b6fb52eebc2626c472d6fa530dc':
  x86: dsputil: Split inline assembly from init code

Conflicts:
libavcodec/x86/dsputil_mmx.c

Note, the author attribution is left in place and not removed
as it is in the merged commit.

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

Merge commit '46bb456853b197f4562de7acf5d42abf11ded9be'

* commit '46bb456853b197f4562de7acf5d42abf11ded9be':
  x86: dsputil: Refactor pixels16 wrapper functions with a macro

Conflicts:
libavcodec/x86/hpeldsp_avg_template.c

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

lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)

This fixes https://bugzilla.libav.org/show_bug.cgi?id=514.

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

doc/filters: add some examples for the fps filter

Signed-off-by: burek <burek021@gmail.com>

md5enc: don't reuse priv_class in two formats

Apparently, this is not allowed and can trip up all sorts of things.

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

Add a generic hash API.

Also use this API in framemd5.

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

Add 128 bit murmur3 hash function.

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

avfilter: Add 'drawgrid' video filter

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

configure: Disable PIC for cygwin just as for win32/mingw

If this is explicitly disabled for win32/mingw, it should also
be disabled for cygwin, for consistency and for the same reasons
as for win32/mingw.

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

Better handling for MXF essence reading reaching EOF.

If no metadata follows MXF essence, that is essence ends with EOF,
"Operation not permitted" error was produced and a non-zero code
was returned from ffmpeg executable.

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

avcodec/lcldec: Check that dimensions are a multiple of the subsample factors

Other dimensions would not work correctly currently,
also ask for a sample for files that fail this check.

This fixes an integer overflow leading to out of array
accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavu/common: make FF_CEIL_RSHIFT faster when shift is constant.

See "[PATCH] lavfi/lut: use FF_CEIL_RSHIFT for chroma w/h rounding."
thread for more information.

fate: fix filter-colorchannelmixer by adding bitexact & accurate flags

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

imgconvert: silence "incompatible pointer type" warning

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

cdgraphics: initialize buffer

Prevent use of uninitialized memory

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

vorbisdec: check codebook entry count

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

tools/ffeval: use av_dynarray2_add()

Simplify, increment robustness.

lavu/mem: add av_dynarray2_add()

Based on a patch by Clément Bœsch.

See thread:
From: Clément Bœsch <ubitux@gmail.com>
Subject: [FFmpeg-devel] [PATCH 1/5] lavu: add av_dynarray_alloc_elem().
Date: Sun, 14 Apr 2013 03:07:54 +0200

lavu: define FF_MEMORY_POISON and use it

Allow single-place definition of constant used to fill poisoned memory.

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not read strd chunk in avi files as H264 extradata.

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

fate: add colorchannelmixer test

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

Do not read strd chunk in avi files as H264 extradata.

Fixes ticket #2561.

tests/lavf-regression: fix gbrp10 dpx test on big endian

For some reason only for that pix format decoder picks native format.

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: x86: Only enable cpunop on i686

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

Merge commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199'

* commit 'f54b55058a429c4eea5bae7e5bcb49bd29b34199':
  configure: Rename cmov processor capability to i686

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

Merge commit 'e08c946c6860a78b0c479551d5f6735361160cbd'

* commit 'e08c946c6860a78b0c479551d5f6735361160cbd':
  configure: Explicitly disable PIC when targeting win32/mingw

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

Merge commit 'b1803c79dcd6d0a345fa1cbe18dd8e2149717121'

* commit 'b1803c79dcd6d0a345fa1cbe18dd8e2149717121':
  configure: Use enable_weak when enabling pic

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

pngenc: Add 'dpi', 'dpm' options

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

fate: increase coverage for dpx encoder

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

dpxenc: simplifiy code using AVPixFmtDescriptor

Update rgb24 fate test as it no longer writes image in big endian
format.

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

dpxenc: do not set coded_frame

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

x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

The header is not (anymore) MMX-specific.

x86: dsputil: Split inline assembly from init code

Also remove some pointless comments.

x86: dsputil: Refactor pixels16 wrapper functions with a macro

sws/output: remove offset/coef for alpha in rgba64

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

swscale: RGBA64 output

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure: x86: Only enable cpunop on i686

The assembler may insert nopl instructions for cpunop, which are not
(universally) supported on i586 CPUs.

configure: Rename cmov processor capability to i686

The goal is to make the capapility slightly more general and have it
cover the availability of the nopl instruction in addition to cmov.

aacenc: Fix ticket #1784: erasure of surround channels

This was due to a miscomputation of s->cur_channel, which led to
psy-based encoders using the psy coefficients for the wrong channel.
Test sample attached on the bug tracker had the peculiar case of all
other channels being silent, so the error was far more noticeable.

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

configure: Explicitly disable PIC when targeting win32/mingw

These platforms do not have any notion of PIC. On some compilers,
enabling pic produces a number of warnings.

This avoids trying to produce PIC loads in the ARM assembly - there
are no relocation types in PE/COFF that correspond to
BFD_RELOC_32_PCREL (R_ARM_REL32 in ELF).

As a side-effect, this avoids enabling PIC on mingw64, getting rid
of the warnings about PIC not having any effect on that platform.

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

configure: Use enable_weak when enabling pic

This allows it to be overridden, either by the user on the command
line, or by other sections of the configure script.

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

sws/packed_16bpc_bswap: fix handling of negative stride

Revert "sws: support endianness conversion for AV_PIX_FMT_RGBA64"

This reverts commit 23f7b14f2851d1d1a969c12b7e337826f0c74a43.

This commit broke fate

redspark: fix memleak in redspark_read_header

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

fate: add exr tests

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

sws: support endianness conversion for AV_PIX_FMT_RGBA64

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

doc/filters: split item options which are not aliases.

fate/filter: test gradfun timeline.

fate/filter: test hqdn3d timeline.

lavfi/hqdn3d: restore timeline feature.

lavfi/hqdn3d: use macros instead of hardcoded indexes.

lavfi: replace passthrough_filter_frame with a flag.

With the introduction of AVFilterContext->is_disabled, we can simplify
the custom passthrough mode in filters.

This commit is technically a small compat break, but the timeline was
introduced very recently.

Doxy by Stefano Sabatini.

lavfi/vflip: use FF_CEIL_RSHIFT for chroma w/h rounding.

lavfi/lut: use FF_CEIL_RSHIFT for chroma w/h rounding.

lavfi/select: unbreak compatibility with older PICT_TYPE syntax

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

Merge remote-tracking branch 'jamrial/adpcm'

* jamrial/adpcm:
  ADPCM IMA Radical decoder
  RedSpark demuxer
  RSD demuxer
  adpcm_thp: Allow the use of extradata for the adpcm table
  ADP demuxer
  ADPCM DTK decoder

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

ffv1enc: fix 1000l typo

Thanks to ubitux for spotting that
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffv1: check for malloc failure.

Somehow i managed to loose this fix before pushing

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

ffv1enc: Fix memleak

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

ffv1enc: dont set coded_frame

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

ffv1dec: Support frame threading with gop > 1

This is about 20-30% faster than slice threading

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

ffv1enc: Check the return value of ffv1_common_init()

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

ffv1: Switch to ThreadFrame

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

avfilter/af_astats: fix 64bit printf type

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

avfilter/vf_mp: remove unused function

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

vf_copy: silence "incompatible pointer type" warning

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

doc/filters: remove duplicated abuffer docs

doc/filters: sort audio filters by name

lavfi/curves: avoid ctx pointer indirection.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  indeo3: avoid writes without necessary alignment in copy_cell()

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

Merge commit '2c299d4165cd9653153e12270971c2368551b79e'

* commit '2c299d4165cd9653153e12270971c2368551b79e':
  x86: sbrdsp: implement SSE2 qmf_pre_shuffle

Conflicts:
libavcodec/x86/sbrdsp.asm
libavcodec/x86/sbrdsp_init.c

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

Merge commit '16a4a18db089af8c432f1cdec62155000585b72c'

* commit '16a4a18db089af8c432f1cdec62155000585b72c':
  af_asyncts: fix offset calculation

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

Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'

* commit '72fbc9685c08baae7ab9996642707eaab873b6f1':
  avconv: use current syntax for the scale filter

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

ADPCM IMA Radical decoder

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

RedSpark demuxer

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

RSD demuxer

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

adpcm_thp: Allow the use of extradata for the adpcm table

There are several containers that support adpcm_thp (Also known as Gamecube DSP)
streams, but only thp files contain the coeff table and previous sample inside
each frame.
Some don't even contain previous sample information at all.

This change will make it easier to implement demuxers for said containers
without having to create a new decoder.

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

ADP demuxer

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

ADPCM DTK decoder

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

sws: add casts to silence pointer type mismatch warnings

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

sws/output/yuv2gbrp_full_X_c(): silence warning about uninitialized variable

clang did not show this one, so i missed it in the last batch

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