mimic: Fix race condition

Fixes access after free.

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

sws/output: silence warnings about uninitialized use of variables

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

takdec: simplify use of scalarproduct_int16 in decode_subframe()

Makes decoding little faster.

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

Add fate test for solid colour lagarith frames.

lavfi/opencl: replace SHIFTUP with FF_CEIL_RSHIFT.

lavfi/overlay: simpler up-rounded w/h computations.

lavu: add FF_CEIL_RSHIFT and use it in various places.

ffadler: fix duplicate \n on errors

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

lavfi: remove alphaextract special code

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

ffadler: add multifile support

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

tools: Add adler32 checksum tool

This is about 6 times faster than md5sum on linux

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

fate: add test for lut filter

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Remove unused argument from QPEL_OP macro

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

Merge commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e'

* commit '6e9f8d6a7d7392a236df19fef6f4eba41f18167e':
  x86: vf_yadif: Remove stray dsputil_mmx #include

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

Merge commit '3d40c1ee742db5f13ebcf53c2d1fa4bf4f39bcd2'

* commit '3d40c1ee742db5f13ebcf53c2d1fa4bf4f39bcd2':
  x86: dsputil: Move TRANSPOSE4 macro to the only place it is used

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

Merge commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57'

* commit '71469f3b636fbe06b6aca5933f9fdebddd8d5f57':
  x86: dsputil: Move constant declarations into separate header

Conflicts:
libavcodec/x86/dsputil_mmx.c

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

Merge commit 'ed880050edf061b38d3e39e25657c59ad9108b27'

* commit 'ed880050edf061b38d3e39e25657c59ad9108b27':
  x86: dsputil: Group all assembly constants together in constants.c

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

Merge commit '87614667606b42476f9017d79faf12b45a0bd77c'

* commit '87614667606b42476f9017d79faf12b45a0bd77c':
  x86: dsputil: Move ff_pd assembly constants to the only place they are used

Conflicts:
libavcodec/x86/lpc.c

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

avfilter: fix 2 warnings about discarding const

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

ffmpeg: add -apad option which injects a apad filter only in the presence of video streams

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

ffmpeg: use av_freep() for forced_kf_pts

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

avfilter/af_apad: Support AVFILTER_FLAG_SUPPORT_TIMELINE

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

avfilter: Make enabled/disabled state available as a field of the AVFilterContext

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

lavfi/extractplanes: packed rgb support

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

lavfi/colorchannelmixer: remove now redudant code

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

lavfi/drawutils: add 16 bit rgb and planar rgb to ff_fill_rgba_map()

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

x86: dsputil: Remove unused argument from QPEL_OP macro

x86: vf_yadif: Remove stray dsputil_mmx #include

x86: dsputil: Move TRANSPOSE4 macro to the only place it is used

x86: dsputil: Move constant declarations into separate header

lavfi/null: remove redudant lines

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

libswscale: simplify isAnyRGB macro

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

lavfi/lut: add support for YUVA422P and YUVA444P

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

lavfi: add gbrap support to some filters

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

libswscale: GBRAP input & output and GBRAP16 input support

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  msvc: Move linker pragma from config.h to libavutil/internal.h

Conflicts:
configure

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

Merge commit 'bd392785a75d7d51414a9788d50396a8d9f29d77'

* commit 'bd392785a75d7d51414a9788d50396a8d9f29d77':
  fate-run: Drop unnecessary regtest() indirection

Conflicts:
tests/fate-run.sh

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

Merge commit '1b343cedd7cd68e7865aa5280d1568c7e5d79917'

* commit '1b343cedd7cd68e7865aa5280d1568c7e5d79917':
  x86: dsputil: Remove unused ff_pb_3F constant
  x86: dsputil: Remove unused MOVQ_BONE macro

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

Merge commit '63bac48f734fc69cca2ef2cfada92cd9a222734d'

* commit '63bac48f734fc69cca2ef2cfada92cd9a222734d':
  x86: dsputil: Move rv40-specific functions where they belong

Conflicts:
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h

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

Merge commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2'

* commit '92f8e06ecb431a427ea13d794e5a6bc927a034d2':
  x86: dsputil hpeldsp: Move shared template functions into separate object

Conflicts:
libavcodec/x86/Makefile

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

Merge commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087'

* commit '7edaf4edb5c3c04f34ad1242680cbc32d11f4087':
  x86: rnd_template: Eliminate pointless OP_AVG macro indirection

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

Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'

* commit 'db9aee6ccf183508835acc325f5ad87d595eacc4':
  oma: properly forward errors in oma_read_packet

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

Merge commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0'

* commit '6f98508e2b86dcb79614d8c9b8e97c5e83a21cb0':
  oma: return meaningful errors

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

Merge commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9'

* commit 'e55e8b2c362a60bad66929d83d8c83b0d7f5ffc9':
  lavc: do not leak frames in avcodec_decode_audio4

Conflicts:
libavcodec/utils.c

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

Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'

* commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe':
  nut: use meaningful error values
  FATE: use a less ambiguous end time for filter-trim-time test

Conflicts:
libavformat/nutdec.c
tests/fate/filter-video.mak

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

configure: use shorter variable name for "libavdevice_pc_deps"

This is in line with the new name for the libavfilter variable.

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

Merge commit '9779f93066ee5ea6fba6b76f001d358cc2857891'

* commit '9779f93066ee5ea6fba6b76f001d358cc2857891':
  configure: add dependencies to lavfi .pc file

Conflicts:
configure

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

Merge commit 'bce70f8170592599a4f2f5f02606c1246e88df57'

* commit 'bce70f8170592599a4f2f5f02606c1246e88df57':
  configure: make avconv select (a)trim filters

Conflicts:
configure

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

Merge commit '481575d255195c6c2f32e04686b94de984ae78d4'

* commit '481575d255195c6c2f32e04686b94de984ae78d4':
  avconv: remove -deinterlace

Conflicts:
Changelog
doc/ffmpeg.texi
ffmpeg.c
ffmpeg_opt.c

The merge removes the documentation for the deprecated -deinterlace
the code itself has already been replaced a while ago by code
that inserts yadif, that insertion code is left in place.

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

Merge commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8'

* commit 'a97d8cc16e0da30c9ffefa1ede2a0adf3db5f3f8':
  indeo3: use unaligned reads on reference blocks.

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

Merge commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c'

* commit '70f9661542a581dfe93b636b1c55b5558e4a4e3c':
  jpeg2000dec: initialize static data just once

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

Merge commit '45a1694fde251ee56e23aec073d73172c00aa470'

* commit '45a1694fde251ee56e23aec073d73172c00aa470':
  jpeg2000dec: cleanup properly after decoding errors

Conflicts:
libavcodec/jpeg2000dec.c

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

x86: sbrdsp: force PIC addressing for Win64

MSVC complains about the 32bits addressing, while mingw/gcc does not.

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

lavfi/unsharp: use verbal form in help message options

lavu/mem: fix potential int overflow and crash in av_dynarray_add()

Also extend documentation accordingly.

lavu/mem: extend documentation for av_dynarray_add()

In particular, mention the fact that the amortized element addition cost
is constant.

avcodec/mpegvideo: Fix edge emu with lowres

Fixes a few green artifacts at the top
Fixes rest of Ticket 2535

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

avcodec/mpegvideo: Fix block height for lowres 3 interlaced blocks

Fixes green trash
Fixes part of Ticket2535

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

x86: dsputil: Group all assembly constants together in constants.c

x86: dsputil: Move ff_pd assembly constants to the only place they are used

msvc: Move linker pragma from config.h to libavutil/internal.h

This makes linking succeed for tools that include config.h but
don't link to libavutil.

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

Merge remote-tracking branch 'cigaes/master'

* cigaes/master:
  lavfi: add comments to explain the negotiation loop.
  lavfi: fix filter format negotiation loop.
  ffmpeg: move a local variable definition later.

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

avformat/vqf: check number of channels before use.

Fixes division by zero

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

sanm: Check dimensions before use

Fixes integer overflow and out of array accesses

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

avcodec/cdgraphics: check buffer size before use

Fixes out of array accesses

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

dxa: check vectors of 2x2 motion blocks

Fixes out of array reads

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

dxa: check vectors of 4x4 motion blocks

Fixes out of array reads

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

shorten: allocate space for padding

Fixes array overread

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

fate-run: Drop unnecessary regtest() indirection

The indirection was used to abstract from the different -regression.sh
scripts. Now that only one remains, this indirection is pointless.

lavfi: add comments to explain the negotiation loop.

lavfi: fix filter format negotiation loop.

query_formats() returning EAGAIN is not considered a progress
in the format negotiation.

If the filter returns EAGAIN but did set some of its formats
lists, it could be considered a partial success and counted
as progress in the negotiation. Not counting it is not a
problem because it currently only happens in the first round,
where there will always be some progress on the other filters.

ffmpeg: move a local variable definition later.

Fix a segfault when using the -map option without input files.

x86: dsputil: Remove unused ff_pb_3F constant

x86: dsputil: Move rv40-specific functions where they belong

x86: dsputil: Remove unused MOVQ_BONE macro

x86: dsputil hpeldsp: Move shared template functions into separate object

x86: rnd_template: Eliminate pointless OP_AVG macro indirection

gifdec: reset previous Graphic Control Extension disposal type

This fixes out of array accesses.

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

lavfi/overlay: reindent fix.

lavfi/alphaextract: copy width and not linesize.

Padding data is not supposed to be copied.

sws: factorize rgb 9+ planar funcs declarations.

oma: properly forward errors in oma_read_packet

Prevent spurios EIO on EOF.

CC:libav-stable@libav.org

oma: return meaningful errors

lavc: do not leak frames in avcodec_decode_audio4

Notwithstanding the return value the frame should be freed if
is not going to be used.

Reported-by: Matthew Wolenetz <wolenetz@chromium.org>

nut: use meaningful error values

Fix the mispresented EINVAL for EOF on partial files, among the other.

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Support decoding of Lagarith frame type FRAME_SOLID_COLOR.

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

Ticket #2540 Enable threading when using -c:v libx264rgb

Signed-off-by: Gunther Piez <gupiez@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/av_pix_fmt_swap_endianness: simplify and fix code

This makes the code also more robust, not having a hard-coded
table that can become (and was) incomplete.

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

FATE: use a less ambiguous end time for filter-trim-time test

0.1 seconds at 25 fps is exactly 2.5 frames, which may be rounded either
to 2 or 3 on different platforms.

configure: add dependencies to lavfi .pc file

The scale filter depends on sws, resample on lavr, and movie on lavf and
lavc.

Fixes Bug 502.

configure: make avconv select (a)trim filters

They are now used for -ss/-t

avconv: remove -deinterlace

It is incompatible with refcounted frames and since it's been deprecated
for a long time now, fixing it is not worth the effort.

indeo3: use unaligned reads on reference blocks.

They are not guaranteed to be aligned.
Fixes Bug 503.

CC:libav-stable@libav.org

Support decoding of Lagarith frame type FRAME_SOLID_COLOR.

Fixes bug 459.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate-jpeg2000-dcinema: force output to xyz12le

Conflicts:
tests/fate/video.mak

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

Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'

* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
  vf_scale: add endianness conversion pixel format in query_formats

Conflicts:
libavfilter/vf_scale.c

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

Merge commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c'

* commit '9cfa21c8c2b81146aab574f55c93f27e5c2d435c':
  swscale: support endianness conversion for AV_PIX_FMT_XYZ12

Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c

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

Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

* commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491':
  swscale: add support for endianness only conversion

Conflicts:
libswscale/utils.c
libswscale/version.h

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

Merge commit '74652af821d7e526a6541876a637fbf81261fa8e'

* commit '74652af821d7e526a6541876a637fbf81261fa8e':
  pixdesc: add function to return pixel format with swapped endiannes

Conflicts:
libavutil/pixdesc.c
libavutil/version.h

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

Add FATE test for matroska error recovery.

This is the first 2 MB of the official test7.mkv.
That length seems to be enough to detect the bugs
we had in our code so far.

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