Merge commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62'

* commit '3f0b6d7a6248a33df37b98cfcb37a1acce263f62':
  wavpack: use bytestream2 in wavpack_decode_block

Conflicts:
libavcodec/wavpack.c

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

Merge commit 'f36d7831d96aeb072db5a2b78892a534d96e288e'

* commit 'f36d7831d96aeb072db5a2b78892a534d96e288e':
  pixdesc: mark gray8 as pseudopal

Conflicts:
libavutil/pixdesc.c

No change as gray8 was already marked as pseudopal in FFmpeg

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

Merge commit '3eae9b030cbbdc263f69834b791624613032d548'

* commit '3eae9b030cbbdc263f69834b791624613032d548':
  mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes

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

avformat/utils: Keep internal and external av_read_frame() packets in sync.

Otherwise, during error conditions, the caller will be left with
dangling pointers to a destructed packet => boom.

BUG=242786
TEST=ffmpeg_regression_tests

Commit slightly simplified by commiter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavfi/mp: try to pass interlaced & tff flags

This makes mp=softpulldown actually useful.

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

lavfi/lut3d: avoid overread.

wavpack: use bytestream2 in wavpack_decode_block

Prevent most out of buffer reads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

avcodec/aic: Fix vlc value checks

Fixes out of array accesses

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

pixdesc: mark gray8 as pseudopal

Many functions treat it as such already.
Fixes Bug 499.

CC:libav-stable@libav.org

proresdec: Fix end condition

Fixes out of array writes
No FFmpeg release is affected by this

This also fixes some artifacts

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

smvjpegdec: use av_pix_fmt_desc_get() avoid direct table access

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

v4l2: make possible to disable libv4l2 at runtime.

Also disable it by default since it looks currently buggy. The
usefulness of such library is mostly limited to backward compatibility
with very old devices.

lavfi: add lut3d filter.

Fixes part of Ticket #2517.

shorten: fix "off by padding" bug

Fixes array overread

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

mpegvideo: unref buffers in ff_mpeg_unref_picture on frame size changes

ff_mpeg_unref_picture clears the flag indicating that the frame needs to
be reallocated after a frame size change. Since we have now reference
counted buffers we can unref the buffers immediately.

Support playing SMV files.

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

avienc: Disallow the first frame to be skiped

Fixes Ticket2386

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Enable the strtod workaround when building for bionic

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Add a fate test for ProRes Transparency.

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

j2kdec & jpeg2000dec: check lengthinc against array size

Fixes out of array reads

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

j2k & jpeg2000dec: reset numX/Ytiles if tiles failed allocation

Fixes null pointer dereference

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

avcodec/jpeg2000dec: Port tile size check from j2kdec

Fixes potential integer overflow

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

jpeg2000dec: check TPsot

Fixes out of array accesses

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

jpeg2000dec: read and check curtileno

Fixes out of array accesses
Code ported from j2kdec

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

jpeg2000dec & j2kdec: Fix return type of get_sot()

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

vcodec/jpeg2000dec: fix av_log() type

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

j2kdec: cosmetics from jpeg2000dec

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

avcodec/jpeg2000dec: merge bytestream2 reading from j2kdec

This fixes at least one out of array access

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

avcodec/jpeg2000dec: get_qcx, fix stack and heap overwrites

This is likely remotely exploitable
Fix ported from j2kdec
No uptodate FFmpeg release should be affected by this

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

Add a fate test for ProRes Transparency.

lavu/opt: check if class is NULL too

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

lavfi/(a)showinfo: use link frame counter instead of local counter.

avutil/pixfmt: add forgotten deprecated to YUVJ411

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

jpeg2000dec: Check ncomponents and tile dimensions

Fixes various problems

Code ported from j2kdec

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

avcodec/j2k: rename J2K_ constants to JPEG2000_

This should simplify merging the 2 decoders

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

j2k: Rename structs to be more similar to jpeg2000dec

This should simplify merging

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

j2kdec: s/decode_packets/jpeg2000_decode_packets/

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

lavfi/geq: prefer symbolic constants

Hopefully enhance readability.

lavfi/geq: add aliases for RGB options

vp3: zero allocated tables

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

configure: Enable the strtod workaround when building for bionic

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

seek-test: make duration user configurable

Previously this was hardcoded to 4 seconds

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

lavfi/yadif: add timeline support.

avcodec/huffman: increase bits constant

Fixes Ticket2593

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

avcodec/huffman: use named identifer for the bits constant

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

avcodec/bitstream: print vlc length in error case.

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

mjpegdec: fix AV_PIX_FMT_YUVJ411P handling

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

add YUVJ411P

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  proresdec: simplify slice component offsets handling

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

Merge commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8'

* commit 'cfbd98abe82cfcb9984a18d08697251b72b110c8':
  mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac

Conflicts:
libavcodec/mjpegdec.c

See: 1f41cffe1e3e79620f587545bdfcbd7e6e68ed29

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

Merge commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965'

* commit 'c209d0df657f172f42d9bafbcdfa02dfb14f6965':
  fate.sh: add support for build-only FATE instances

Conflicts:
doc/fate.texi

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

Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'

* commit 'a030279a67ef883df8cf3707774656fa1be81078':
  ljpeg: use the correct number of components in yuv

Conflicts:
libavcodec/mjpegdec.c

See: b2e57eb5a3cb9d5dfab601077fa0edee91e06ca5

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

Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'

* commit '8aa3500905fec6c4e657bb291b861d43c34d3de9':
  mjpeg: Validate sampling factors

Conflicts:
libavcodec/mjpegdec.c

See: 08c37a10e9ef7e30d7b7a889ad28c7fa9c49c886

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

proresdec: simplify slice component offsets handling

mjpegdec: validate parameters in mjpeg_decode_scan_progressive_ac

Prevent out of buffer write when decoding broken samples.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

fate.sh: add support for build-only FATE instances

If the "build_only" variable is set in the configuration file, the
FATE client will skip running tests and just compile all targets.

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

avutil/frame: continue to process bufs even if some are empty

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

avutil/md5: move loop inside inner function

AMD Athlon(tm) II X3 450 Processor

size: 1048576  runs: 1024  time:    5.660 +- 0.023
size: 1048576  runs: 1024  time:    5.661 +- 0.030
size: 1048576  runs: 1024  time:    5.656 +- 0.022
size: 1048576  runs: 1024  time:    5.647 +- 0.026

size: 1048576  runs: 1024  time:    5.428 +- 0.037
size: 1048576  runs: 1024  time:    5.426 +- 0.034
size: 1048576  runs: 1024  time:    5.426 +- 0.034
size: 1048576  runs: 1024  time:    5.428 +- 0.038

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

ljpeg: use the correct number of components in yuv

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

mjpeg: Validate sampling factors

They must be non-zero.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

smacker: remove av_clip_int16()

Fixes Ticket2425

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

libx264: silence: warning: the address of val will always evaluate as true

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

lavd/v4l2enc: check write return value.

avcodec/ratecontrol: silence "warning: expected_bits may be used uninitialized in this function"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avutil/hmac: silence pointer type warnings

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: unref old current_picture before allocating a new one

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

Merge commit 'db347280eb3746d7b70888db97f1efe5f06f5624'

* commit 'db347280eb3746d7b70888db97f1efe5f06f5624':
  vorbis: fallback to normal division instead of crashing

Conflicts:
libavcodec/vorbisdec.c

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

Merge commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0'

* commit 'ddf1b4a2f8a680126eb611428e4f47e6e5b8c6c0':
  vorbis: simplify the inner loop in setup_classifs

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

Merge commit '36f10380043c8b8c5cbf8c1add8695089cdaa341'

* commit '36f10380043c8b8c5cbf8c1add8695089cdaa341':
  vorbis: use normal integer values for iterators

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

doc/filters: add RGB geq example

doc/filters: extend/fix documentation for the geq filter

Merge commit '98186578a2a21af5bfe6dd71d222dc270f763c7d'

* commit '98186578a2a21af5bfe6dd71d222dc270f763c7d':
  vorbis: refactor vorbis_residue_decode_internal

Conflicts:
libavcodec/vorbisdec.c

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

Merge commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834'

* commit 'c360fb174b01170ab3fd3048d4d0acb44aa4e834':
  win32: Do not use GetProcAddress when compiled for Vista+

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

Merge commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f'

* commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f':
  configure: msvc: Set the target windows version to XP if no target is set

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

md5: optimize second round by using 4-operation form of G()

4-operation form is preferred over 3-operation because it breaks a long
dependency chain, thus allowing a superscalar processor to execute more
operations in parallel.
The idea was taken from: http://www.zorinaq.com/papers/md5-amd64.html

AMD Athlon(tm) II X3 450 Processor, x86_64

$ for i in $(seq 1 4); do ./avutil_md5_test2; done
size: 1048576  runs: 1024  time:    5.821 +- 0.019
size: 1048576  runs: 1024  time:    5.822 +- 0.019
size: 1048576  runs: 1024  time:    5.841 +- 0.018
size: 1048576  runs: 1024  time:    5.821 +- 0.018

$ for i in $(seq 1 4); do ./avutil_md5_test2; done
size: 1048576  runs: 1024  time:    5.646 +- 0.019
size: 1048576  runs: 1024  time:    5.646 +- 0.018
size: 1048576  runs: 1024  time:    5.642 +- 0.019
size: 1048576  runs: 1024  time:    5.641 +- 0.019

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

lavfi/geq: mark timeline support

lavd: add v4l2 outdev.

lavd/v4l2: move pixel format conversion code to a separate place.

This will be shared with the output device.

avformat/matroskadec: fix integer overflow

Fixes fate-mkv with ekopath 4

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

mpegvideo: unref old current_picture before allocating a new one

Allows decoding with only three frame buffers with frame reference
counting. Fixes VAAPI based decoding in vlc which uses only three
frame buffers for the mpegvideo-based codecs.

vorbis: fallback to normal division instead of crashing

The use of ff_inverse speeds up slightly arches + compilers that
do not provide a division faster than the whole machinery, such
as ppc32 + gcc4.7, but has operational limits.

Drop the always-enable assert and provide a fallback.

vorbis: simplify the inner loop in setup_classifs

vorbis: use normal integer values for iterators

No need to use fixed-size integers.

vorbis: refactor vorbis_residue_decode_internal

configure: add more allocation functions to valgrind-massif

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

cmdutils: show timeline support in -filters listing

lavfi/drawgrid: fix drawgrid options after 4c205f42c86

doc/Makefile: install .3 man pages to man3 subdir

Fix trac ticket #2585.

build: drop unused ALLMANPAGES variable

mjpeg_decode_com: remove redundant len checks

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

mjpegdec: Fix field orderforinterlacedAVDJand AVRN in ntsc mode

Fixes ticket1656

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

tools: add zmqshell.py.

win32: Do not use GetProcAddress when compiled for Vista+

Instead link directly to the condition variable functions.

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

configure: msvc: Set the target windows version to XP if no target is set

MSVC 2010 (or more precisely, Windows SDK 7.0 which comes with MSVC
2010) sets _WIN32_WINNT to the constant for Windows 7 if nothing is
set. This could lead to the libav configure script detecting and
using functions only present in Windows 7 or newer, which in most
cases isn't desired. If the caller explicitly wants this, the caller
can add the _WIN32_WINNT define via --extra-cflags, setting the desired
version.

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

lavfi/histogram: cache log2 of max_hval

Instead of calculating same value over and over again.

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

swscale/output: silence warning about undefined 'ASSERT_LEVEL'

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

swscale/output: remove unused header

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

ffv1dec: defuse membomb

Fixes Ticket2589

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

configure: use the user specified valgrind excutable for massif

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

configure: fix valgrind-massif to actually work

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